hiera -> 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 1277a9c..948127f 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -47,12 +47,6 @@ class roles {
        if has_role('security_upload') {
                include roles::security_upload
        }
-       if has_role('api.ftp-master') {
-               ssl::service { 'api.ftp-master.debian.org':
-                       notify  => Exec['service apache2 reload'],
-                       key => true,
-               }
-       }
        #
        # security.debian.org
        if has_role('security_master') {
@@ -97,10 +91,6 @@ class roles {
                include roles::pubsub
        }
 
-       if has_role('dbmaster') {
-               include roles::dbmaster
-       }
-
        if has_role('dns_primary') {
                include roles::dns_primary
        }
@@ -109,10 +99,6 @@ class roles {
                include roles::dns_geodns
        }
 
-       if has_role('vote') {
-               include roles::vote
-       }
-
        if has_role('security_tracker') {
                include roles::security_tracker
        }
@@ -133,17 +119,6 @@ class roles {
                include roles::sso_rp
        }
 
-       if has_role('tracker') {
-               include roles::tracker
-       }
-
-       if has_role('piuparts') {
-               include roles::piuparts
-       }
-       if has_role('piuparts_slave') {
-               include roles::piuparts_slave
-       }
-
        if has_role('contributors') {
                include roles::contributors
        }
@@ -288,12 +263,4 @@ class roles {
        if has_role('debsources') {
                include roles::debsources
        }
-
-       if has_role('debconf_wafer') {
-               include roles::debconf_wafer
-       }
-
-       if has_role('cdbuilder_local_mirror') {
-               include roles::cdbuilder_local_mirror
-       }
 }