From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 25 Nov 2016 14:04:14 +0000 (+0100)
Subject: Install new apache on draghi
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8416d17e9da55ff46b89e852eeb9174746895544;p=mirror%2Fdsa-puppet.git

Install new apache on draghi
---

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',
 	}