From aec3d9af6d17e1ecf7eec086a233ec4836d0718b Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 9 Feb 2018 20:00:00 +0100
Subject: [PATCH] no more experimental_apache (previously cgi-grnet-01,
 pejacevic, petrova)

---
 hieradata/common.yaml               | 4 ----
 modules/debian_org/manifests/apt.pp | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4afb6bbf7..29d235dd3 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -317,10 +317,6 @@ roles:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
-  experimental_apache:
-    - cgi-grnet-01.debian.org
-    - pejacevic.debian.org
-    - petrova.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
diff --git a/modules/debian_org/manifests/apt.pp b/modules/debian_org/manifests/apt.pp
index 48b617e6e..3fc0979ee 100644
--- a/modules/debian_org/manifests/apt.pp
+++ b/modules/debian_org/manifests/apt.pp
@@ -41,11 +41,7 @@ class debian_org::apt {
 		}
 	}
 
-	if has_role('experimental_apache') {
-		$dbdosuites = [ 'debian-all', $::lsbdistcodename, 'jessie-apache2' ]
-	} else {
-		$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
-	}
+	$dbdosuites = [ 'debian-all', $::lsbdistcodename ]
 	site::aptrepo { 'db.debian.org':
 		url        => 'http://db.debian.org/debian-admin',
 		suite      => $dbdosuites,
-- 
2.20.1