Decommission pkgmirror-1and1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8d54dd8..0c3fcd9 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -78,7 +78,6 @@ roles:
     - nono.debian.org
   packages:
     - picconi.debian.org
     - nono.debian.org
   packages:
     - picconi.debian.org

-    - pkgmirror-1and1.debian.org

     - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.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 373b8fe..15a2a34 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -139,7 +139,7 @@ class apache2 {
                script => 'ps_',
        }
 
                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':
                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 a2a79df..50adbbf 100644 (file)
--- 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
     # decommissioning
     - rautavaara.debian.org
     # mirrors, secondaries, syncproxies

-    - pkgmirror-1and1.debian.org

     - pkgmirror-csail.debian.org
     - steffani.debian.org
     # porterbox
     - pkgmirror-csail.debian.org
     - steffani.debian.org
     # porterbox