Remove ftp-upcoming

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 601e14400f35b782ddb9fde7734712ff811a8028..d76823d10f6cf5805463559062ec660d57388d8d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,15 +8,24 @@ class roles {
                include munin::master
        }
 
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
-               include nagios::server
-       }
+       #if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       #       include nagios::server
+       #}
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
        }
 
-       if $::hostname in [chopin,franck,morricone,bizet] {
+       if getfromhash($site::nodeinfo, 'porterbox') {
+               include porterbox
+       }
+
+       if getfromhash($site::nodeinfo, 'bugs_mirror') {
+               include roles::bugs_mirror
+       }
+
+       if getfromhash($site::nodeinfo, 'ftp_master') {
+               include roles::ftp_master
                include roles::dakmaster
        }
 
@@ -28,10 +37,6 @@ class roles {
                include roles::www_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
        if getfromhash($site::nodeinfo, 'ftp.d.o') {
                include roles::ftp
        }
@@ -40,15 +45,42 @@ class roles {
                include roles::ftp_upload
        }
 
-       if $::hostname in [bizet,morricone] {
-               include roles::backports_master
-       }
-
        if getfromhash($site::nodeinfo, 'security_master') {
                include roles::security_master
+               include roles::dakmaster
+       }
+
+       if getfromhash($site::nodeinfo, 'www_master') {
+               include roles::www_master
+       }
+
+       if getfromhash($site::nodeinfo, 'keyring') {
+               include roles::keyring
+       }
+
+       if getfromhash($site::nodeinfo, 'wiki') {
+               include roles::wiki
+       }
+
+       if getfromhash($site::nodeinfo, 'static_master') {
+               include roles::static_master
+       }
+
+       if getfromhash($site::nodeinfo, 'static_mirror') {
+               include roles::static_mirror
+       } elsif getfromhash($site::nodeinfo, 'static_source') {
+               include roles::static_source
+       }
+
+       if getfromhash($site::nodeinfo, 'weblog_provider') {
+               include roles::weblog_provider
+       }
+
+       if getfromhash($site::nodeinfo, 'mailrelay') {
+               include roles::mailrelay
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if $::hostname in [ravel] {
+               include roles::weblog_destination
        }
 }