X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=a17e92bc2e74147b1f459a026789814cb809a3cb;hb=69ae10698c417e4157aa1cde3d4415b0636c69b5;hp=8e833181a921f79e68630fe84996943886e6e338;hpb=4e8859da2c042d6a41d5eebf39c0c65cd17eebcb;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8e833181a..a17e92bc2 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -255,7 +255,6 @@ 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-accumu.debian.org:
@@ -283,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
@@ -332,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:
@@ -350,6 +356,13 @@ 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:
@@ -359,3 +372,5 @@ roles:
     - sallinen.debian.org
   kanboard:
     - kantuser.debian.org
+  anonscm:
+    - cgi-grnet-01.debian.org