i18n, l10n -> hiera role; explicitly include apache2

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ec3f6e1..bc752fb 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -96,9 +96,6 @@ class roles {
                include postgres::backup_server
        }
 
-       if has_role('historicalpackages') {
-               ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
 
        if has_role('qamaster') {
                ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
@@ -120,21 +117,6 @@ class roles {
                include roles::snapshot_shell
        }
 
-       if has_role('planet_master') {
-               include roles::planet_master
-       }
-       if has_role('planet_search') {
-               ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
-       if has_role('i18n.d.o') {
-               ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
-       if has_role('l10n.d.o') {
-               ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if has_role('ports_master') {
                include roles::ports_master
        }