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 3960f1e..948127f 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,33 +15,10 @@ class roles {
                include nagios::server
        }
 
-       if has_role('bugs_mirror') {
-               include roles::bugs_mirror
-       }
-
-       if has_role('bugs_base') {
-               ssl::service { 'bugs.debian.org':
-                       notify  => Exec['service apache2 reload'],
-                       key => true,
-               }
-               ferm::rule { 'dsa-bugs-abusers':
-                       prio    => "005",
-                       rule    => "saddr (220.243.135/24 220.243.136/24) DROP",
-               }
-       }
-       if has_role('bugs_master') {
-               ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-               ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if has_role('manpages-dyn') {
                include roles::manpages_dyn
        }
 
-       if has_role('archvsync_base_additional') {
-               include archvsync_base
-       }
-
        # archive.debian.org
        if has_role('historical_mirror') {
                include roles::historical_mirror
@@ -70,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') {
@@ -104,10 +75,6 @@ class roles {
                ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       if has_role('keyring') {
-               include roles::keyring
-       }
-
        if has_role('wiki') {
                include roles::wiki
        }
@@ -116,20 +83,6 @@ class roles {
                include roles::syncproxy
        }
 
-       if has_role('static_master') {
-               include roles::static_master
-       }
-
-       if has_role('static_mirror') {
-               include roles::static_mirror
-       } elsif has_role('static_source') {
-               include roles::static_source
-       }
-
-       if has_role('weblog_provider') {
-               include roles::weblog_provider
-       }
-
        if has_role('mailrelay') {
                include roles::mailrelay
        }
@@ -138,10 +91,6 @@ class roles {
                include roles::pubsub
        }
 
-       if has_role('dbmaster') {
-               include roles::dbmaster
-       }
-
        if has_role('dns_primary') {
                include roles::dns_primary
        }
@@ -150,22 +99,10 @@ class roles {
                include roles::dns_geodns
        }
 
-       if has_role('weblog_destination') {
-               include roles::weblog_destination
-       }
-
-       if has_role('vote') {
-               include roles::vote
-       }
-
        if has_role('security_tracker') {
                include roles::security_tracker
        }
 
-       if has_role('lists') {
-               include roles::lists
-       }
-
        if has_role('rtmaster') {
                include roles::rtmaster
        }
@@ -182,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
        }
@@ -201,10 +127,6 @@ class roles {
                include roles::nm
        }
 
-       if has_role('rtc') {
-               include roles::rtc
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }
@@ -271,13 +193,6 @@ class roles {
                include roles::snapshot_shell
        }
 
-       if has_role('veyepar.debian.org') {
-               include roles::veyepar
-       }
-       if has_role('sreview.debian.org') {
-               include roles::sreview
-       }
-
        if has_role('debtags') {
                include roles::debtags
        }
@@ -337,10 +252,6 @@ class roles {
                include bacula::storage
        }
 
-       if has_role('salsa.debian.org') {
-               include salsa
-       }
-
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }
@@ -352,23 +263,4 @@ class roles {
        if has_role('debsources') {
                include roles::debsources
        }
-
-       if has_role('ipsec') {
-               include ipsec
-       }
-
-       if has_role('debconf_wafer') {
-               include roles::debconf_wafer
-       }
-
-       if has_role('cdbuilder_local_mirror') {
-               include roles::cdbuilder_local_mirror
-       }
-
-       if has_role('alioth_archive') {
-               include roles::alioth_archive
-       }
-       if has_role('anonscm') {
-               include roles::anonscm
-       }
 }