milanollo on stretch, no more experimental apache

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 2e01263..2641a0b 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -36,6 +36,7 @@ roles:
     - fasolo.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
+    - suchon.debian.org
     - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
@@ -45,9 +46,8 @@ 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:
@@ -114,6 +114,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 +130,14 @@ 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
   ssh.upload.d.o:
     - coccia.debian.org
+    - suchon.debian.org
     - usper.debian.org
   sso:
     - diabelli.debian.org
@@ -150,7 +155,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 +162,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 +199,6 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
@@ -213,6 +215,10 @@ roles:
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
+  bacula_director:
+    - dinis.debian.org
+  bacula_storage:
+    - storace.debian.org
   dabackup_client:
     - moszumanska.debian.org
     - lw03.debian.org
@@ -226,6 +232,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:
@@ -268,17 +275,12 @@ roles:
     - 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
@@ -289,14 +291,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: