Merge remote-tracking branch 'origin/master' into zobel-salsa

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 311cefc..eae4051 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -11,7 +11,6 @@ samhain_recipients:
   - 'debian-archive-debian-samhain-reports@master.debian.org'
   - 'debian-admin@ftbfs.de'
   - 'weasel@debian.org'
-  - 'steve@lobefin.net'
   - 'zumbi@oron.es'
 root_mail_alias:
   - 'debian-admin@debian.org'
@@ -45,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:
@@ -121,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:
@@ -194,6 +190,7 @@ roles:
     - dummy
   static_source:
     - boott.debian.org
+    - casulana.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
@@ -259,13 +256,14 @@ roles:
         - '130.89.148.12:80'
         - '[2001:610:1908:b000::148:12]:80'
         - '[2001:67c:2564:a119::148:12]:80'
-      fastly-backend: false
+      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
@@ -282,11 +280,7 @@ roles:
       listen-addresses:
         - '149.20.4.15:80'
         - '[2001:4f8:1:c::15]:80'
-      fastly-backend: false
-  debian_mirror_onion:
-    - klecker.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-isc.debian.org
+      onion_v4_address: 149.20.4.15
   historical_master:
     - sibelius.debian.org
   historical_mirror:
@@ -323,10 +317,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
@@ -362,3 +352,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