debconf_wafer: explicitly include apache2

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e416069..fb057a5 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -35,13 +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:
@@ -71,10 +64,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  keyring:
-    - kaufmann.debian.org
-  lists:
-    - bendel.debian.org
   mailrelay:
     - mailly.debian.org
     - muffat.debian.org
@@ -112,8 +101,6 @@ roles:
     - quantz.debian.org
   rtmaster:
     - reger.debian.org
-  rtc:
-    - vogler.debian.org
   search_backend:
     - wolkenstein.debian.org
   search_frontend:
@@ -195,16 +182,6 @@ roles:
     - ullmann.debian.org
   vote:
     - vento.debian.org
-  weblog_destination:
-    - wolkenstein.debian.org
-  weblog_provider:
-    - klecker.debian.org
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - santoro.debian.org
-    - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:
@@ -309,17 +286,10 @@ roles:
     - seger.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
-  insecure_ssl:
-    - debussy.debian.org
-    - godard.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
@@ -327,8 +297,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