Merge branch 'zobel-salsa'

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index aa0bba3..e78f982 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:
@@ -138,7 +134,7 @@ 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
@@ -194,6 +190,7 @@ roles:
     - dummy
   static_source:
     - boott.debian.org
+    - casulana.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
@@ -320,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
@@ -359,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