From 8416d17e9da55ff46b89e852eeb9174746895544 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 25 Nov 2016 15:04:14 +0100 Subject: [PATCH] Install new apache on draghi --- hieradata/common.yaml | 2 ++ modules/debian-org/manifests/apt.pp | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 7743e41ff..54bc42811 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -238,3 +238,5 @@ roles: - porta.debian.org onionbalance: - olin.debian.org + experimental_apache: + - draghi.debian.org diff --git a/modules/debian-org/manifests/apt.pp b/modules/debian-org/manifests/apt.pp index e01370123..2b4dee324 100644 --- a/modules/debian-org/manifests/apt.pp +++ b/modules/debian-org/manifests/apt.pp @@ -33,9 +33,15 @@ class debian-org::apt { suite => "${mungedcodename}/updates", components => ['main','contrib','non-free'] } + + if has_role('experimental_apache') { + dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ] + else + dbdosuites = [ 'debian-all', $::lsbdistcodename ] + } site::aptrepo { 'db.debian.org': url => 'http://db.debian.org/debian-admin', - suite => [ 'debian-all', $::lsbdistcodename ], + suite => $dbdosuites, components => 'main', key => 'puppet:///modules/debian-org/db.debian.org.gpg', } -- 2.20.1