udd -> 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..fefab3f 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,9 +34,6 @@ class roles {
                include roles::dakmaster
                include roles::signing
        }
-       if has_role('security_upload') {
-               include roles::security_upload
-       }
        #
        # security.debian.org
        if has_role('security_master') {
@@ -48,14 +45,6 @@ class roles {
                include roles::security_mirror
        }
 
-       if has_role('git_master') {
-               include roles::git_master
-       }
-
-       if has_role('wiki') {
-               include roles::wiki
-       }
-
        if has_role('syncproxy') {
                include roles::syncproxy
        }
@@ -72,37 +61,14 @@ class roles {
                include roles::dns_geodns
        }
 
-       if has_role('security_tracker') {
-               include roles::security_tracker
-       }
-
        if has_role('rtmaster') {
                include roles::rtmaster
        }
 
-       if has_role('udd') {
-               include roles::udd
-       }
-
-       if has_role('sso') {
-               include roles::sso
-       }
-
-       if has_role('sso_rp') {
-               include roles::sso_rp
-       }
-
        if has_role('postgres_backup_server') {
                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, }
-       }
 
        if has_role('packagesqamaster') {
                ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
@@ -116,25 +82,6 @@ class roles {
                include roles::snapshot_web
        }
 
-       if has_role('snapshot_shell') {
-               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
        }