Merge remote-tracking branch 'waldi/srv-mirrors'

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a217891..bcfc622 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -32,6 +32,7 @@ roles:
   extranrpeclient:
     - denis.debian.org
   ftp.d.o:
+    # also see debian_mirror
     - klecker.debian.org
   ftp_master:
     - fasolo.debian.org
@@ -210,11 +211,17 @@ 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_mirror:
+    - gretchaninov.debian.org
+    - klecker.debian.org
+    - sibelius.debian.org
   debug_mirror:
     - klecker.debian.org
     - mirror-isc.debian.org
@@ -237,7 +244,7 @@ roles:
     - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
-  ports-master:
+  ports_master:
     - porta.debian.org
   onionbalance:
     - olin.debian.org
@@ -269,6 +276,6 @@ roles:
     - wieck.debian.org
   bgp:
     - bilbao.debian.org
-    - boman.debian.org
+    - mirror-conova.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org