From: Julien Cristau <jcristau@debian.org>
Date: Thu, 6 Oct 2016 18:06:14 +0000 (+0200)
Subject: Decommission pkgmirror-1and1
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3813b782e921aaebc7534886a293ea037c06b948;p=mirror%2Fdsa-puppet.git

Decommission pkgmirror-1and1
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8d54dd8ed..0c3fcd9bb 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -78,7 +78,6 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
-    - pkgmirror-1and1.debian.org
     - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 373b8fe18..15a2a341c 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -139,7 +139,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1,pkgmirror-csail] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-csail] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index a2a79df34..50adbbfb6 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -146,7 +146,6 @@ host_settings:
     # decommissioning
     - rautavaara.debian.org
     # mirrors, secondaries, syncproxies
-    - pkgmirror-1and1.debian.org
     - pkgmirror-csail.debian.org
     - steffani.debian.org
     # porterbox