popcon -> hiera role; explicitly include apache2

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index db93f44..57b47b6 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -45,10 +45,6 @@ roles:
     - denis.debian.org
   ftp_master:
     - fasolo.debian.org
-  git_master:
-    - adayevskaya.debian.org
-  historicalpackages:
-    - hier.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -62,10 +58,6 @@ roles:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
-  popcon:
-    - pinel.debian.org
-  qamaster:
-    - quantz.debian.org
   rtmaster:
     - reger.debian.org
   security_master:
@@ -105,27 +97,6 @@ roles:
     wieck.debian.org:
       service-hostname: wieck.security.backend.mirrors.debian.org
       fastly-backend: true
-  security_tracker:
-    - soriano.debian.org
-  security_upload:
-    - suchon.debian.org
-  sso:
-    - diabelli.debian.org
-  # single sign on relying party (host) - also required apache2 module enabled on that host via other means
-  sso_rp:
-    - debussy.debian.org
-    - diabelli.debian.org
-    - jerea.debian.org
-    - nono.debian.org
-    - quantz.debian.org
-    - tate.debian.org
-    - ticharich.debian.org
-    - wilder.debian.org
-    - wuiet.debian.org
-  static_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
-    - senfter.debian.org
   syncproxy:
     - gretchaninov.debian.org
     - klecker.debian.org
@@ -135,10 +106,6 @@ roles:
     - mirror-umn.debian.org
     - schmelzer.debian.org
     - smit.debian.org
-  udd:
-    - ullmann.debian.org
-  wiki:
-    - wilder.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
@@ -187,14 +154,6 @@ roles:
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  planet_master:
-    - philp.debian.org
-  planet_search:
-    - philp.debian.org
-  i18n.d.o:
-    - tye.debian.org
-  l10n.d.o:
-    - tye.debian.org
   ports_master:
     - porta.debian.org
   onionbalance:
@@ -202,11 +161,6 @@ roles:
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
-  apache_prefork:
-    # php needs this
-    - quantz.debian.org
-    - tchaikovsky.debian.org
-    - wuiet.debian.org
   postgresql_server:
     # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
@@ -219,18 +173,6 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  apache_ratelimited:
-    - beach.debian.org
-    - buxtehude.debian.org
-    - lw07.debian.org
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
-    - sallinen.debian.org
-  snapshot_web:
-    - lw07.debian.org
-    - sallinen.debian.org
-  snapshot_shell:
-    - lw08.debian.org
 
 classes:
   - base::includes