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 05e8f52..6c52105 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -118,8 +118,6 @@ roles:
   security_mirror:
     mirror-anu.debian.org:
       fastly-backend: false
-    mirror-conova.debian.org:
-      fastly-backend: false
     mirror-csail.debian.org:
       fastly-backend: false
     mirror-isc.debian.org:
@@ -172,6 +170,7 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
@@ -198,6 +197,7 @@ roles:
     - dillon.debian.org
     - donizetti.debian.org
     - fasolo.debian.org
+    - kaufmann.debian.org
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
@@ -212,7 +212,6 @@ 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
@@ -265,34 +264,25 @@ roles:
     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
     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:
-    mirror-conova.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
     mirror-accumu.debian.org:
       onion_v4_address: 130.242.6.199
       service-hostname: accumu.debug.backend.mirrors.debian.org
@@ -304,7 +294,6 @@ roles:
       service-hostname: conova.debug.backend.mirrors.debian.org
   debug_mirror_onion:
     - mirror-accumu.debian.org
-    - mirror-conova.debian.org
     - schmelzer.debian.org
   ports_mirror:
     - klecker.debian.org
@@ -329,7 +318,6 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
   cdimage-search:
@@ -345,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
@@ -384,3 +374,6 @@ roles:
     - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
+
+classes:
+  - base