X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=d62a933bdf8ade3ef39959255213e858fb076668;hb=d3e812cb9c2b22b06511876a1520cddc2da12db1;hp=05e8f52bacaeb6730c31c3f50a23c6fbc43a57b4;hpb=61b8596d839c75366cfd6a7a82d1c7392f562cf1;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 05e8f52ba..d62a933bd 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -28,8 +28,6 @@ roles:
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
-  buildd_master:
-    - wuiet.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -98,8 +96,6 @@ roles:
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
-  puppetmaster:
-    - handel.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:
@@ -118,8 +114,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 +166,7 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
@@ -198,6 +193,7 @@ roles:
     - dillon.debian.org
     - donizetti.debian.org
     - fasolo.debian.org
+    - kaufmann.debian.org
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
@@ -212,10 +208,10 @@ 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
+    - smit.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -265,34 +261,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 +291,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 +315,6 @@ roles:
   onionbalance:
     - olin.debian.org
   bgp:
-    - mirror-conova.debian.org
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
   cdimage-search:
@@ -345,10 +330,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 +371,6 @@ roles:
     - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
+
+classes:
+  - base::includes