X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=e94ef9b9bf35c7f6e7513ae9a42d17bcfe47f021;hb=48cf1d7f51154072c1648b9f34453eb93a83e9ea;hp=8d15f70a4a1ad35cc62fde556c9a0e183e616244;hpb=51de62135be26931ec3ce6bcdba86910310f0262;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8d15f70a4..e94ef9b9b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -4,8 +4,6 @@ searchpaths: []
 resolvoptions: []
 allow_dns_query: []
 roles:
-  archive_master:
-    - sibelius.debian.org
   bugsmx:
     - buxtehude.debian.org
   bugs_master:
@@ -32,6 +30,7 @@ roles:
   extranrpeclient:
     - denis.debian.org
   ftp.d.o:
+    # also see debian_mirror
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
@@ -163,6 +162,7 @@ roles:
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
+    - melartin.debian.org
     - porta.debian.org
     - philp.debian.org
     - respighi.debian.org
@@ -210,12 +210,19 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
+    # - klecker.debian.org
     - bilbao.debian.org
     - boman.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
     - bilbao.debian.org
     - mirror-isc.debian.org
+  historical_master:
+    - sibelius.debian.org
+  historical_mirror:
+    - gretchaninov.debian.org
+    - klecker.debian.org
+    - sibelius.debian.org
   debug_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -238,7 +245,7 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
@@ -270,5 +277,6 @@ roles:
     - wieck.debian.org
   bgp:
     - bilbao.debian.org
+    - mirror-conova.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org