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 cc82cda76cbdbec279295f92cf7d021d46cfbb41..d76823d10f6cf5805463559062ec660d57388d8d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -13,11 +13,13 @@ class roles {
        #}
 
        if getfromhash($site::nodeinfo, 'buildd') {
-               $foo = getfromhash($site::nodeinfo, 'buildd')
-               notice("Buildd is ${foo}")
                include buildd
        }
 
+       if getfromhash($site::nodeinfo, 'porterbox') {
+               include porterbox
+       }
+
        if getfromhash($site::nodeinfo, 'bugs_mirror') {
                include roles::bugs_mirror
        }
@@ -35,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
        }
@@ -47,11 +45,6 @@ class roles {
                include roles::ftp_upload
        }
 
-       if getfromhash($site::nodeinfo, 'backports_master') {
-               include roles::backports_master
-               include roles::dakmaster
-       }
-
        if getfromhash($site::nodeinfo, 'security_master') {
                include roles::security_master
                include roles::dakmaster
@@ -65,8 +58,8 @@ class roles {
                include roles::keyring
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if getfromhash($site::nodeinfo, 'wiki') {
+               include roles::wiki
        }
 
        if getfromhash($site::nodeinfo, 'static_master') {
@@ -78,4 +71,16 @@ class roles {
        } 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 $::hostname in [ravel] {
+               include roles::weblog_destination
+       }
 }