dgit_{browse,git} -> hiera role; explicitly include apache2

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f75b609..ffaafe9 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,19 +35,6 @@ staticsync::basedir: '/srv/static.debian.org'
 roles:
   bugsmx:
     - buxtehude.debian.org
-  bugs_master:
-    - buxtehude.debian.org
-  bugs_mirror:
-    - beach.debian.org
-  bugs_base:
-    - buxtehude.debian.org
-    - beach.debian.org
-  contributors:
-    - nono.debian.org
-  dbmaster:
-    - draghi.debian.org
-  debtags:
-    - tate.debian.org
   dns_primary:
     - denis.debian.org
   dns_geo:
@@ -61,18 +48,10 @@ roles:
   ftp.upload.d.o:
     - coccia.debian.org
     - usper.debian.org
-  api.ftp-master:
-    - coccia.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
-  lists:
-    - bendel.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -85,8 +64,6 @@ roles:
     - menotti.debian.org
   nagiosmaster:
     - tchaikovsky.debian.org
-  nm:
-    - nono.debian.org
   packages:
     - picconi.debian.org
     - pkgmirror-csail.debian.org
@@ -94,13 +71,6 @@ roles:
     - picconi.debian.org
   packagesqamaster:
     - quantz.debian.org
-  people:
-    - paradis.debian.org
-  piuparts:
-    - pejacevic.debian.org
-  piuparts_slave:
-    - piu-slave-bm-a.debian.org
-    - piu-slave-ubc-01.debian.org
   popcon:
     - pinel.debian.org
   pubsub:
@@ -110,10 +80,6 @@ roles:
     - 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:
@@ -185,12 +151,8 @@ roles:
     - mirror-umn.debian.org
     - schmelzer.debian.org
     - smit.debian.org
-  tracker:
-    - ticharich.debian.org
   udd:
     - ullmann.debian.org
-  vote:
-    - vento.debian.org
   wiki:
     - wilder.debian.org
   www_master:
@@ -265,8 +227,6 @@ roles:
     - tye.debian.org
   l10n.d.o:
     - tye.debian.org
-  dedup.d.n:
-    - delfin.debian.org
   pet.d.n:
     - petrova.debian.org
   ports_master:
@@ -297,12 +257,6 @@ roles:
     - vittoria.debian.org
   debsources:
     - sor.debian.org
-  debconf_wafer:
-    - debussy.debian.org
-  apache_not_public:
-    # Hosts that run apache but where it should not be open to the internet by
-    # default
-    - casulana.debian.org
   apache_ratelimited:
     - beach.debian.org
     - buxtehude.debian.org
@@ -310,8 +264,6 @@ roles:
     - picconi.debian.org
     - pkgmirror-csail.debian.org
     - sallinen.debian.org
-  cdbuilder_local_mirror:
-    - casulana.debian.org
   snapshot_web:
     - lw07.debian.org
     - sallinen.debian.org