Add schmelzer to a couple more things

[mirror/dsa-puppet.git] / hieradata / common.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 29d235d..f49384f 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -118,8 +118,6 @@ roles:
   security_mirror:
     mirror-anu.debian.org:
       fastly-backend: false
-    mirror-bytemark.debian.org:
-      fastly-backend: false
     mirror-conova.debian.org:
       fastly-backend: false
     mirror-csail.debian.org:
@@ -134,10 +132,15 @@ roles:
       fastly-backend: false
     lobos.debian.org:
       service-hostname: lobos.security.backend.mirrors.debian.org
-      fastly-backend: true
+      fastly-backend: false
       onion_v4_address: 212.211.132.250
     santoro.debian.org:
       fastly-backend: false
+    schmelzer.debian.org:
+      fastly-backend: false
+    schumann.debian.org:
+      service-hostname: schumann.security.backend.mirrors.debian.org
+      fastly-backend: true
     setoguchi.debian.org:
       fastly-backend: false
     sechter.debian.org:
@@ -212,6 +215,7 @@ roles:
     - mirror-conova.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
+    - schmelzer.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -242,7 +246,6 @@ roles:
   bacula_storage:
     - storace.debian.org
   dabackup_client:
-    - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
@@ -254,16 +257,8 @@ roles:
     klecker.debian.org:
       listen-addresses:
         - '130.89.148.12:80'
-        - '[2001:610:1908:b000::148:12]:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
-    mirror-bytemark.debian.org:
-      service-hostname: bytemark.debian.backend.mirrors.debian.org
-      listen-addresses:
-        - '5.153.231.45:80'
-        - '[2001:41c8:1000:21::21:45]:80'
-      fastly-backend: true
-      onion_v4_address: 5.153.231.45
     mirror-accumu.debian.org:
       service-hostname: accumu.debian.backend.mirrors.debian.org
       fastly-backend: true
@@ -281,20 +276,32 @@ roles:
         - '149.20.4.15:80'
         - '[2001:4f8:1:c::15]:80'
       onion_v4_address: 149.20.4.15
+    schmelzer.debian.org:
+      service-hostname: conova.debian.backend.mirrors.debian.org
   historical_master:
     - sibelius.debian.org
   historical_mirror:
     - gretchaninov.debian.org
     - klecker.debian.org
     - mirror-conova.debian.org
+    - schmelzer.debian.org
     - sibelius.debian.org
   debug_mirror:
-    - klecker.debian.org
-    - mirror-conova.debian.org
-    - mirror-isc.debian.org
+    mirror-conova.debian.org:
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      onion_v4_address: 217.196.149.232
+      service-hostname: conova.debug.backend.mirrors.debian.org
+    mirror-accumu.debian.org:
+      onion_v4_address: 130.242.6.199
+      service-hostname: accumu.debug.backend.mirrors.debian.org
+    schmezler.debian.org:
+      service-hostname: conova.debug.backend.mirrors.debian.org
   debug_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
+    - mirror-accumu.debian.org
+    - mirror-conova.debian.org
+    - schmelzer.debian.org
   ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -318,7 +325,6 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-bytemark.debian.org
     - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
@@ -352,3 +358,23 @@ roles:
     - storace.debian.org
   debconf_wafer:
     - debussy.debian.org
+  apache_not_public:
+    # Hosts that run apache but where it should not be open to the internet by
+    # default
+    - casulana.debian.org
+  apache_ratelimited:
+    - beach.debian.org
+    - buxtehude.debian.org
+    - lw07.debian.org
+    - picconi.debian.org
+    - pkgmirror-csail.debian.org
+    - sallinen.debian.org
+  cdbuilder_local_mirror:
+    - casulana.debian.org
+  alioth_archive:
+    - grabbe.debian.org
+  snapshot_web:
+    - lw07.debian.org
+    - sallinen.debian.org
+  anonscm:
+    - cgi-grnet-01.debian.org