having a module named site is really annoying

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index abb603f..6c52105 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:
@@ -120,25 +116,40 @@ 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
-    - santoro.debian.org
-    - setoguchi.debian.org
-    - sechter.debian.org
-    - villa.debian.org
-    - wieck.debian.org
-  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-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: false
+      onion_v4_address: 212.211.132.250
+    santoro.debian.org:
+      fastly-backend: false
+    schmelzer.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:
+      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:
@@ -159,6 +170,7 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
@@ -180,10 +192,12 @@ roles:
     - dummy
   static_source:
     - boott.debian.org
+    - casulana.debian.org
     - coccia.debian.org
     - dillon.debian.org
     - donizetti.debian.org
     - fasolo.debian.org
+    - kaufmann.debian.org
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
@@ -198,9 +212,9 @@ roles:
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
-    - mirror-conova.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
+    - schmelzer.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -231,7 +245,6 @@ roles:
   bacula_storage:
     - storace.debian.org
   dabackup_client:
-    - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
@@ -240,36 +253,48 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - klecker.debian.org
-    - mirror-bytemark.debian.org:
-        service-hostname: bytemark.debian.backend.mirrors.debian.org
-        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
-    - mirror-isc.debian.org
-  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:67c:2564:a119::148:12]:80'
+      onion_v4_address: 130.89.148.12
+    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-isc.debian.org:
+      listen-addresses:
+        - '149.20.4.15:80'
+        - '[2001:4f8:1:c::15]:80'
+      onion_v4_address: 149.20.4.15
+    schmelzer.debian.org:
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      fastly-backend: true
+      service-hostname: conova.debian.backend.mirrors.debian.org
   historical_master:
     - sibelius.debian.org
   historical_mirror:
     - gretchaninov.debian.org
     - klecker.debian.org
-    - mirror-conova.debian.org
+    - schmelzer.debian.org
     - sibelius.debian.org
   debug_mirror:
-    - klecker.debian.org
-    - mirror-conova.debian.org
-    - mirror-isc.debian.org
+    mirror-accumu.debian.org:
+      onion_v4_address: 130.242.6.199
+      service-hostname: accumu.debug.backend.mirrors.debian.org
+    schmelzer.debian.org:
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      onion_v4_address: 217.196.149.232
+      service-hostname: conova.debug.backend.mirrors.debian.org
   debug_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
+    - mirror-accumu.debian.org
+    - schmelzer.debian.org
   ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -292,13 +317,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
   cdimage-search:
@@ -314,10 +333,12 @@ roles:
     - buxtehude.debian.org
     - danzi.debian.org
     - fasolo.debian.org
+    - lw07.debian.org
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
     - sibelius.debian.org
+    - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
@@ -331,3 +352,28 @@ 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
+  apache_ratelimited:
+    - beach.debian.org
+    - buxtehude.debian.org
+    - lw07.debian.org
+    - picconi.debian.org
+    - pkgmirror-csail.debian.org
+    - sallinen.debian.org
+  cdbuilder_local_mirror:
+    - casulana.debian.org
+  alioth_archive:
+    - grabbe.debian.org
+  snapshot_web:
+    - lw07.debian.org
+    - sallinen.debian.org
+  snapshot_shell:
+    - lw08.debian.org
+  anonscm:
+    - cgi-grnet-01.debian.org
+
+classes:
+  - base