X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=fb057a56355ba1cc9722f3661c2946deeab96424;hb=9d0e8661b69da3a114ca428746c6fd28b41400b9;hp=e18cf6899ca745f1118587f46316eac7a587a0df;hpb=e44a96b6508415fb4ed53c9c452a8d1b555e95af;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e18cf6899..fb057a563 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,13 +35,6 @@ staticsync::basedir: '/srv/static.debian.org'
 roles:
   bugsmx:
     - buxtehude.debian.org
-  bugs_master:
-    - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
-  bugs_base:
-    - buxtehude.debian.org
-    - beach.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -71,10 +64,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  keyring:
-    - kaufmann.debian.org
-  lists:
-    - bendel.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -112,15 +101,10 @@ roles:
     - quantz.debian.org
   rtmaster:
     - reger.debian.org
-  rtc:
-    - vogler.debian.org
   search_backend:
     - wolkenstein.debian.org
   search_frontend:
     - cgi-grnet-01.debian.org
-  archvsync_base_additional:
-  # this is usually pulled in by *-mirror or syncproxy roles
-    - dummy
   security_master:
     - seger.debian.org
   security_mirror:
@@ -179,37 +163,10 @@ roles:
     - ticharich.debian.org
     - wilder.debian.org
     - wuiet.debian.org
-  static_mirror:
-    - klecker.debian.org
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - senfter.debian.org
-    - santoro.debian.org
   static_mirror_onion:
     - klecker.debian.org
     - mirror-isc.debian.org
     - senfter.debian.org
-  # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
-  static_mirror_nopush:
-    - dummy
-  static_source:
-    - boott.debian.org
-    - casulana.debian.org
-    - coccia.debian.org
-    - dillon.debian.org
-    - donizetti.debian.org
-    - fasolo.debian.org
-    - kaufmann.debian.org
-    - lindsay.debian.org
-    - manziarly.debian.org
-    - mekeel.debian.org
-    - melartin.debian.org
-    - porta.debian.org
-    - philp.debian.org
-    - respighi.debian.org
-    - wolkenstein.debian.org
-    - wuiet.debian.org
   syncproxy:
     - gretchaninov.debian.org
     - klecker.debian.org
@@ -225,16 +182,6 @@ roles:
     - ullmann.debian.org
   vote:
     - vento.debian.org
-  weblog_destination:
-    - wolkenstein.debian.org
-  weblog_provider:
-    - klecker.debian.org
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - santoro.debian.org
-    - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:
@@ -252,10 +199,6 @@ roles:
     - lw03.debian.org
   gobby_debian_org:
     - gombert.debian.org
-  veyepar.debian.org:
-    - vittoria.debian.org
-  sreview.debian.org:
-    - vittoria.debian.org
   debian_mirror:
     klecker.debian.org:
       listen-addresses:
@@ -343,22 +286,10 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  salsa.debian.org:
-    - godard.debian.org
-  insecure_ssl:
-    - debussy.debian.org
-    - godard.debian.org
   debsources:
     - sor.debian.org
-  ipsec:
-    - fasolo.debian.org
-    - storace.debian.org
   debconf_wafer:
     - debussy.debian.org
-  apache_not_public:
-    # Hosts that run apache but where it should not be open to the internet by
-    # default
-    - casulana.debian.org
   apache_ratelimited:
     - beach.debian.org
     - buxtehude.debian.org
@@ -366,17 +297,11 @@ roles:
     - picconi.debian.org
     - pkgmirror-csail.debian.org
     - sallinen.debian.org
-  cdbuilder_local_mirror:
-    - casulana.debian.org
-  alioth_archive:
-    - grabbe.debian.org
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org
   snapshot_shell:
     - lw08.debian.org
-  anonscm:
-    - cgi-grnet-01.debian.org
 
 classes:
   - base::includes