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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 143066750..bb490b16a 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -44,9 +44,6 @@ roles:
     - geo3.debian.org
   extranrpeclient:
     - denis.debian.org
-  ftp.d.o:
-    # also see debian_mirror
-    - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
   ftp.upload.d.o:
@@ -120,7 +117,7 @@ roles:
     - seger.debian.org
   security_mirror:
     mirror-anu.debian.org:
-      onion_v4_address: 150.203.164.61
+      fastly-backend: false
     mirror-bytemark.debian.org:
       fastly-backend: false
     mirror-conova.debian.org:
@@ -137,10 +134,13 @@ 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
+    schumann.debian.org:
+      service-hostname: schumann.security.backend.mirrors.debian.org
+      fastly-backend: true
     setoguchi.debian.org:
       fastly-backend: false
     sechter.debian.org:
@@ -193,6 +193,7 @@ roles:
     - dummy
   static_source:
     - boott.debian.org
+    - casulana.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
@@ -319,10 +320,6 @@ roles:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
-  experimental_apache:
-    - cgi-grnet-01.debian.org
-    - pejacevic.debian.org
-    - petrova.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -358,3 +355,9 @@ 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
+  cdbuilder_local_mirror:
+    - casulana.debian.org