sso -> hiera role; explicitly include apache2

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 350d66e..cd148b2 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -45,13 +45,6 @@ roles:
     - denis.debian.org
   ftp_master:
     - fasolo.debian.org
-  ftp.upload.d.o:
-    - coccia.debian.org
-    - usper.debian.org
-  git_master:
-    - adayevskaya.debian.org
-  historicalpackages:
-    - hier.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -61,9 +54,6 @@ roles:
     - menotti.debian.org
   nagiosmaster:
     - tchaikovsky.debian.org
-  packages:
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
@@ -113,14 +103,6 @@ roles:
       fastly-backend: true
   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
   # single sign on relying party (host) - also required apache2 module enabled on that host via other means
   sso_rp:
     - debussy.debian.org
@@ -147,21 +129,11 @@ roles:
     - smit.debian.org
   udd:
     - ullmann.debian.org
-  wiki:
-    - wilder.debian.org
-  www_master:
-    - wolkenstein.debian.org
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
-  bacula_director:
-    - dinis.debian.org
-  bacula_storage:
-    - storace.debian.org
   dabackup_client:
     - lw03.debian.org
-  gobby_debian_org:
-    - gombert.debian.org
   debian_mirror:
     klecker.debian.org:
       listen-addresses:
@@ -205,14 +177,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: