Make apache worker config not depend on role memberships

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4a7d849..8dec0bc 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -37,8 +37,6 @@ roles:
     - buxtehude.debian.org
   bugs_master:
     - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
@@ -71,10 +69,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 +106,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:
@@ -198,16 +187,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:
@@ -225,10 +204,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:
@@ -316,16 +291,8 @@ 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:
@@ -341,15 +308,11 @@ roles:
     - 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