X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=hieradata%2Fcommon.yaml;h=050ee29e7452bde342e8985fc28a0923e66ebe29;hb=5cec923721311b25fbd4dddb68d5340a2261b1f9;hp=515cbb87552ba46344b9999b8d3b9dd9686a91d0;hpb=c828a1b822d2987966270de951718a77b2a08511;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 515cbb875..050ee29e7 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -45,20 +45,14 @@ roles:
     - cgi-grnet-01.debian.org
   git_master:
     - adayevskaya.debian.org
-  httpredir:
-    - httpredir-bm-01.debian.org
-    - httpredir-csail-01.debian.org
+  historicalpackages:
+    - hier.debian.org
   jenkins:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone_rabbitmq:
-    - rainier.debian.org
-    - rapoport.debian.org
   lists:
     - bendel.debian.org
-  list_search:
-    - stockhausen.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -114,6 +108,8 @@ roles:
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
+    - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
     - lobos.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
@@ -128,11 +124,16 @@ roles:
   security_mirror_no_ftp:
     # hosts that are not part of security.debian.org but
     # only participiate in the anycast do not need ftp
+    - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
     - mirror-bytemark.debian.org
   security_tracker:
     - soriano.debian.org
+  security_upload:
+    - suchon.debian.org
   ssh.upload.d.o:
     - coccia.debian.org
+    - suchon.debian.org
     - usper.debian.org
   sso:
     - diabelli.debian.org
@@ -150,7 +151,6 @@ roles:
     - fasolo.debian.org
     - porta.debian.org
   static_mirror:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
@@ -158,7 +158,6 @@ roles:
     - senfter.debian.org
     - santoro.debian.org
   static_mirror_onion:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-isc.debian.org
     - senfter.debian.org
@@ -196,7 +195,6 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
@@ -230,6 +228,7 @@ roles:
     - klecker.debian.org
     - mirror-bytemark.debian.org
     - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
     - mirror-conova.debian.org
     - mirror-isc.debian.org
   debian_mirror_onion:
@@ -271,18 +270,11 @@ roles:
   onionbalance:
     - olin.debian.org
   experimental_apache:
-    - beach.debian.org
-    - busoni.debian.org
     - cgi-grnet-01.debian.org
     - coccia.debian.org
-    - draghi.debian.org
     - klecker.debian.org
-    - lobos.debian.org
     - manziarly.debian.org
-    - milanollo.debian.org
-    - mirror-anu.debian.org
     - mirror-bytemark.debian.org
-    - mirror-conova.debian.org
     - mirror-csail.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
@@ -293,15 +285,14 @@ roles:
     - pkgmirror-csail.debian.org
     - santoro.debian.org
     - sechter.debian.org
-    - senfter.debian.org
     - setoguchi.debian.org
     - ticharich.debian.org
     - villa.debian.org
-    - wieck.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
     - mirror-accumu.debian.org
+    - mirror-skroutz.debian.org
   cdimage-search:
     - cgi-grnet-01.debian.org
   apache_prefork:
@@ -310,6 +301,7 @@ roles:
     - tchaikovsky.debian.org
     - wuiet.debian.org
   postgresql_server:
+    # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
     - buxtehude.debian.org
     - danzi.debian.org
@@ -318,3 +310,5 @@ roles:
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
+  salsa.debian.org:
+    - godard.debian.org