X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=a17e92bc2e74147b1f459a026789814cb809a3cb;hb=684d359d8ea52bc9111e9cddb3c22190bf293280;hp=bb490b16a9586f86dde6660657dbce4d405fda57;hpb=63a9b03fb48f15a15d4f0fad80a2ce9cbdff1800;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index bb490b16a..a17e92bc2 100644
--- 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:
@@ -257,16 +255,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
@@ -292,12 +282,18 @@ roles:
     - mirror-conova.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
   debug_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
+    - mirror-accumu.debian.org
+    - mirror-conova.debian.org
   ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -321,7 +317,6 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-bytemark.debian.org
     - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
@@ -329,6 +324,7 @@ roles:
     - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
+    - kantuser.debian.org
     - quantz.debian.org
     - tchaikovsky.debian.org
     - wuiet.debian.org
@@ -341,6 +337,7 @@ roles:
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
+    - sallinen.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
   salsa.debian.org:
@@ -359,5 +356,21 @@ roles:
     # 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
+  kanboard:
+    - kantuser.debian.org
+  anonscm:
+    - cgi-grnet-01.debian.org