X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=1d2a70cf13d5d4aebb0469cc07ae411480e43eb9;hb=aaf9598ffa1291f6db6c6db891af8a5f0e436443;hp=54e54e47715f1e253b7a7d98308badfb6f0268a4;hpb=7d961995db18550eaf69682a49736101d2f91257;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 54e54e477..1d2a70cf1 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -139,12 +139,6 @@ roles:
     - mirror-umn.debian.org
     - lobos.debian.org
     - villa.debian.org
-  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:
@@ -275,6 +269,8 @@ roles:
   ports_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
+  planet_master:
+    - philp.debian.org
   planet_search:
     - philp.debian.org
   i18n.d.o:
@@ -291,22 +287,8 @@ roles:
     - olin.debian.org
   experimental_apache:
     - cgi-grnet-01.debian.org
-    - coccia.debian.org
-    - klecker.debian.org
-    - manziarly.debian.org
-    - mirror-bytemark.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
     - pejacevic.debian.org
     - petrova.debian.org
-    - philp.debian.org
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
-    - santoro.debian.org
-    - sechter.debian.org
-    - setoguchi.debian.org
-    - ticharich.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -326,6 +308,7 @@ roles:
     - danzi.debian.org
     - fasolo.debian.org
     - melartin.debian.org
+    - sallinen.debian.org
     - seger.debian.org
     - sibelius.debian.org
     - vittoria.debian.org
@@ -333,3 +316,5 @@ roles:
     - godard.debian.org
   insecure_ssl:
     - godard.debian.org
+  debsources:
+    - sor.debian.org