sso -> hiera role; explicitly include apache2

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a4f01d5..cd148b2 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,10 +35,6 @@ staticsync::basedir: '/srv/static.debian.org'
 roles:
   bugsmx:
     - buxtehude.debian.org
-  contributors:
-    - nono.debian.org
-  debtags:
-    - tate.debian.org
   dns_primary:
     - denis.debian.org
   dns_geo:
@@ -49,51 +45,25 @@ roles:
     - denis.debian.org
   ftp_master:
     - fasolo.debian.org
-  ftp.upload.d.o:
-    - coccia.debian.org
-    - usper.debian.org
-  dgit_browse:
-    - cgi-grnet-01.debian.org
-  dgit_git:
-    - cgi-grnet-01.debian.org
-  git_master:
-    - adayevskaya.debian.org
-  historicalpackages:
-    - hier.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
-  manpages-dyn:
-    - manziarly.debian.org
-    - cgi-grnet-01.debian.org
   mirrormaster:
     - melartin.debian.org
   muninmaster:
     - menotti.debian.org
   nagiosmaster:
     - tchaikovsky.debian.org
-  packages:
-    - picconi.debian.org
-    - pkgmirror-csail.debian.org
   packagesmaster:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
-  people:
-    - paradis.debian.org
   popcon:
     - pinel.debian.org
-  pubsub:
-    - rainier.debian.org
-    - rapoport.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:
     - reger.debian.org
-  search_backend:
-    - wolkenstein.debian.org
-  search_frontend:
-    - cgi-grnet-01.debian.org
   security_master:
     - seger.debian.org
   security_mirror:
@@ -133,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
@@ -167,23 +129,11 @@ roles:
     - smit.debian.org
   udd:
     - ullmann.debian.org
-  wiki:
-    - wilder.debian.org
-  www_master:
-    - wolkenstein.debian.org
-  cgi.d.o:
-    - 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:
@@ -227,22 +177,6 @@ roles:
   debug_mirror_onion:
     - mirror-accumu.debian.org
     - schmelzer.debian.org
-  ports_mirror:
-    - klecker.debian.org
-    - mirror-isc.debian.org
-  ports_mirror_onion:
-    - klecker.debian.org
-    - mirror-isc.debian.org
-  planet_master:
-    - philp.debian.org
-  planet_search:
-    - philp.debian.org
-  i18n.d.o:
-    - tye.debian.org
-  l10n.d.o:
-    - tye.debian.org
-  pet.d.n:
-    - petrova.debian.org
   ports_master:
     - porta.debian.org
   onionbalance:
@@ -250,8 +184,6 @@ roles:
   bgp:
     - mirror-accumu.debian.org
     - mirror-skroutz.debian.org
-  cdimage-search:
-    - cgi-grnet-01.debian.org
   apache_prefork:
     # php needs this
     - quantz.debian.org
@@ -269,8 +201,6 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  debsources:
-    - sor.debian.org
   apache_ratelimited:
     - beach.debian.org
     - buxtehude.debian.org