Revert "Revert "ssh_upload -> hiera role""

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93b87a7..c63ec9a 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
-  dgit_browse:
-    - cgi-grnet-01.debian.org
-  dgit_git:
-    - cgi-grnet-01.debian.org
   git_master:
     - adayevskaya.debian.org
   historicalpackages:
@@ -59,9 +52,6 @@ roles:
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
-  manpages-dyn:
-    - manziarly.debian.org
-    - cgi-grnet-01.debian.org
   mirrormaster:
     - melartin.debian.org
   muninmaster:
@@ -75,21 +65,12 @@ roles:
     - 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:
@@ -131,10 +112,6 @@ roles:
     - 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
@@ -167,19 +144,11 @@ roles:
     - 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:
@@ -223,12 +192,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:
@@ -237,8 +200,6 @@ roles:
     - tye.debian.org
   l10n.d.o:
     - tye.debian.org
-  pet.d.n:
-    - petrova.debian.org
   ports_master:
     - porta.debian.org
   onionbalance:
@@ -246,8 +207,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
@@ -265,8 +224,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