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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 143066750..05cd17abb 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,8 +117,6 @@ roles:
     - seger.debian.org
   security_mirror:
     mirror-anu.debian.org:
-      onion_v4_address: 150.203.164.61
-    mirror-bytemark.debian.org:
       fastly-backend: false
     mirror-conova.debian.org:
       fastly-backend: false
@@ -137,10 +132,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 +191,7 @@ roles:
     - dummy
   static_source:
     - boott.debian.org
+    - casulana.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
@@ -259,13 +258,6 @@ roles:
         - '[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
@@ -319,12 +311,7 @@ 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
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
@@ -332,6 +319,7 @@ roles:
     - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
+    - kantuser.debian.org
     - quantz.debian.org
     - tchaikovsky.debian.org
     - wuiet.debian.org
@@ -358,3 +346,15 @@ 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
+  alioth_archive:
+    - grabbe.debian.org
+  snapshot_web:
+    - sallinen.debian.org
+  kanboard:
+    - kantuser.debian.org