X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=3201ad525210d990e746b9dd9b6a85021104058f;hb=2a639d0531ce5dd40e28cd033908fa244a127112;hp=89d7abc076770d8142684a1a1525b53945bef54b;hpb=f97bd2a2a0cccb68e4de5e8cca2ebaebab0ab153;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 89d7abc07..3201ad525 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,6 +3,10 @@ nameservers: []
 searchpaths: []
 resolvoptions: []
 allow_dns_query: []
+role_config__mirrors:
+  mirror_basedir_prefix: '/srv/mirrors/'
+role_config__syncproxy:
+  mirror_basedir_prefix: '/srv/mirrors/'
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -45,20 +49,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
@@ -82,6 +80,9 @@ roles:
     - paradis.debian.org
   piuparts:
     - pejacevic.debian.org
+  piuparts_slave:
+    - piu-slave-bm-a.debian.org
+    - piu-slave-ubc-01.debian.org
   popcon:
     - pinel.debian.org
   pubsub:
@@ -111,6 +112,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
@@ -125,11 +128,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
@@ -147,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
@@ -155,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
@@ -182,6 +188,7 @@ roles:
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
   tracker:
@@ -193,7 +200,6 @@ roles:
   weblog_destination:
     - wolkenstein.debian.org
   weblog_provider:
-    - busoni.debian.org
     - klecker.debian.org
     - mirror-anu.debian.org
     - mirror-csail.debian.org
@@ -210,6 +216,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
@@ -223,6 +233,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:
@@ -264,18 +275,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
@@ -286,14 +290,13 @@ 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:
@@ -301,3 +304,17 @@ roles:
     - quantz.debian.org
     - tchaikovsky.debian.org
     - wuiet.debian.org
+  postgresql_server:
+    # postgresql instances not managed by puppet otherwise
+    - bmdb1.debian.org
+    - buxtehude.debian.org
+    - danzi.debian.org
+    - fasolo.debian.org
+    - melartin.debian.org
+    - seger.debian.org
+    - sibelius.debian.org
+    - vittoria.debian.org
+  salsa.debian.org:
+    - godard.debian.org
+  insecure_ssl:
+    - godard.debian.org