X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=c946236ac938b17d760eb3c5f4fce118388905e8;hb=ab52321ca7ccd1b0c42c41cd62d4a06b976e119c;hp=d75fbc40d36e611132ed251fb7bd7326c0d446f7;hpb=60ea58277c3d27cc5fff2dcd99ba25f42576d069;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d75fbc40d..c946236ac 100644
--- 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:
@@ -120,31 +116,39 @@ roles:
   security_master:
     - seger.debian.org
   security_mirror:
-    - mirror-anu.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-conova.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - mirror-accumu.debian.org
-    - mirror-skroutz.debian.org
-    - lobos.debian.org:
-        service-hostname: lobos.security.backend.mirrors.debian.org
-        fastly-backend: true
-    - santoro.debian.org
-    - setoguchi.debian.org
-    - sechter.debian.org
-    - villa.debian.org:
-        service-hostname: villa.security.backend.mirrors.debian.org
-        fastly-backend: true
-    - wieck.debian.org:
-        service-hostname: wieck.security.backend.mirrors.debian.org
-        fastly-backend: true
-  security_mirror_onion:
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - lobos.debian.org
-    - villa.debian.org
+    mirror-anu.debian.org:
+      fastly-backend: false
+    mirror-bytemark.debian.org:
+      fastly-backend: false
+    mirror-conova.debian.org:
+      fastly-backend: false
+    mirror-csail.debian.org:
+      fastly-backend: false
+    mirror-isc.debian.org:
+      onion_v4_address: 149.20.4.14
+    mirror-umn.debian.org:
+      onion_v4_address: 128.101.240.215
+    mirror-accumu.debian.org:
+      fastly-backend: false
+    mirror-skroutz.debian.org:
+      fastly-backend: false
+    lobos.debian.org:
+      service-hostname: lobos.security.backend.mirrors.debian.org
+      fastly-backend: true
+      onion_v4_address: 212.211.132.250
+    santoro.debian.org:
+      fastly-backend: false
+    setoguchi.debian.org:
+      fastly-backend: false
+    sechter.debian.org:
+      fastly-backend: false
+    villa.debian.org:
+      service-hostname: villa.security.backend.mirrors.debian.org
+      fastly-backend: true
+      onion_v4_address: 212.211.132.32
+    wieck.debian.org:
+      service-hostname: wieck.security.backend.mirrors.debian.org
+      fastly-backend: true
   security_tracker:
     - soriano.debian.org
   security_upload:
@@ -186,6 +190,7 @@ roles:
     - dummy
   static_source:
     - boott.debian.org
+    - casulana.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
@@ -246,38 +251,36 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - klecker.debian.org:
-        listen-addresses:
-          - '130.89.148.12:80'
-          - '[2001:610:1908:b000::148:12]:80'
-          - '[2001:67c:2564:a119::148:12]:80'
-        fastly-backend: false
-    - 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
-    - mirror-accumu.debian.org:
-        service-hostname: accumu.debian.backend.mirrors.debian.org
-        fastly-backend: true
-    - mirror-skroutz.debian.org:
-        service-hostname: skroutz.debian.backend.mirrors.debian.org
-        fastly-backend: true
-    - mirror-conova.debian.org:
-        listen-addresses:
-          - '217.196.149.232:80'
-          - '[2a02:16a8:dc41:100::232]:80'
-        fastly-backend: false
-    - mirror-isc.debian.org:
-        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
+    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-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
+    mirror-skroutz.debian.org:
+      service-hostname: skroutz.debian.backend.mirrors.debian.org
+      fastly-backend: true
+    mirror-conova.debian.org:
+      service-hostname: conova.debian.backend.mirrors.debian.org
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      fastly-backend: true
+    mirror-isc.debian.org:
+      listen-addresses:
+        - '149.20.4.15:80'
+        - '[2001:4f8:1:c::15]:80'
+      onion_v4_address: 149.20.4.15
   historical_master:
     - sibelius.debian.org
   historical_mirror:
@@ -314,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
@@ -353,3 +352,7 @@ 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