push the cert to bugs

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index cc82cda76cbdbec279295f92cf7d021d46cfbb41..8a5e19dac35ae81d78e07e0bd53e6493aaae15d8 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,81 +1,162 @@
 class roles {
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
+       if has_role('puppetmaster') {
                include puppetmaster
        }
 
-       if getfromhash($site::nodeinfo, 'muninmaster') {
+       if has_role('muninmaster') {
                include munin::master
        }
 
-       #if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       if has_role('nagiosmaster') {
        #       include nagios::server
-       #}
+               ssl::service { 'nagios.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 
+       # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'buildd') {
-               $foo = getfromhash($site::nodeinfo, 'buildd')
-               notice("Buildd is ${foo}")
                include buildd
        }
 
-       if getfromhash($site::nodeinfo, 'bugs_mirror') {
+       # XXX: turn this into a real role
+       if getfromhash($site::nodeinfo, 'porterbox') {
+               include porterbox
+       }
+
+       if has_role('bugs_mirror') {
                include roles::bugs_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'ftp_master') {
+       if has_role('bugs_base') {
+               ssl::service { 'bugs.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('ftp_master') {
                include roles::ftp_master
                include roles::dakmaster
        }
 
+       # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
                include roles::security_mirror
        }
 
+       # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
                include roles::www_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
-       if getfromhash($site::nodeinfo, 'ftp.d.o') {
+       if has_role('ftp.d.o') {
                include roles::ftp
        }
 
-       if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+       if has_role('ftp.upload.d.o') {
                include roles::ftp_upload
        }
 
-       if getfromhash($site::nodeinfo, 'backports_master') {
-               include roles::backports_master
-               include roles::dakmaster
-       }
-
-       if getfromhash($site::nodeinfo, 'security_master') {
+       if has_role('security_master') {
                include roles::security_master
                include roles::dakmaster
        }
 
-       if getfromhash($site::nodeinfo, 'www_master') {
+       if has_role('www_master') {
                include roles::www_master
        }
 
-       if getfromhash($site::nodeinfo, 'keyring') {
+       if has_role('keyring') {
                include roles::keyring
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if has_role('wiki') {
+               include roles::wiki
+       }
+
+       if has_role('syncproxy') {
+               include roles::syncproxy
        }
 
-       if getfromhash($site::nodeinfo, 'static_master') {
+       if has_role('static_master') {
                include roles::static_master
        }
 
-       if getfromhash($site::nodeinfo, 'static_mirror') {
+       if has_role('static_mirror') {
                include roles::static_mirror
-       } elsif getfromhash($site::nodeinfo, 'static_source') {
+       } 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
+       }
+
+       if has_role('pubsub') {
+               include roles::pubsub
+       }
+
+       if has_role('dbmaster') {
+               include roles::dbmaster
+       }
+
+       if has_role('dns_primary') {
+               include named::primary
+       }
+       if has_role('dns_secondary') {
+               include named::authoritative
+       }
+
+       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
+       }
+
+       if has_role('udd') {
+               include roles::udd
+       }
+
+       if has_role('sso') {
+               include roles::sso
+       }
+
+       if has_role('buildd_master') {
+               include roles::buildd_master
+       }
+
+       if has_role('piuparts') {
+               include roles::piuparts
+       }
+
+       if has_role('contributors') {
+               include roles::contributors
+       }
+
+       if has_role('nm') {
+               include roles::nm
+       }
+
+       if has_role('release') {
+               include roles::release
+       }
 }