X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=eb7134dff91a0e34e922af79671bad3a2ee08339;hb=6ecc5aff091790a2d65d2f911215032d76e3a43d;hp=51efd579e5342953933b64b1718c4d2374b74fb6;hpb=0b161f0a88754cba72489804a4357c3c88aa5406;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 51efd579e..eb7134dff 100644
--- 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:
@@ -136,6 +134,8 @@ roles:
       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
@@ -170,6 +170,7 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
@@ -196,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
@@ -210,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:
@@ -243,7 +245,6 @@ roles:
   bacula_storage:
     - storace.debian.org
   dabackup_client:
-    - moszumanska.debian.org
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
@@ -263,44 +264,37 @@ 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:
+    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
-    mirror-isc.debian.org:
-      listen-addresses:
-        - '149.20.4.15:80'
-        - '[2001:4f8:1:c::15]:80'
-      onion_v4_address: 149.20.4.15
-      service-hostname: mirror-isc3.debian.org
-    mirror-accumu.debian.org:
-      onion_v4_address: 130.242.6.199
-      service-hostname: accumu.debug.backend.mirrors.debian.org
   debug_mirror_onion:
     - mirror-accumu.debian.org
-    - mirror-conova.debian.org
-    - mirror-isc.debian.org
+    - schmelzer.debian.org
   ports_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -324,14 +318,12 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
-    - kantuser.debian.org
     - quantz.debian.org
     - tchaikovsky.debian.org
     - wuiet.debian.org
@@ -341,11 +333,12 @@ roles:
     - buxtehude.debian.org
     - danzi.debian.org
     - fasolo.debian.org
+    - lw07.debian.org
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
-    - sallinen.debian.org
     - sibelius.debian.org
+    - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
@@ -377,7 +370,14 @@ roles:
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org
-  kanboard:
-    - kantuser.debian.org
+  snapshot_shell:
+    - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
+  loghost:
+    - loghost-grnet-01.debian.org
+    - loghost-osuosl-01.debian.org
+    - lotti.debian.org
+
+classes:
+  - base