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 7ff4457af629f25c1ba2dbc9af4a4d0a0e6be860..d76823d10f6cf5805463559062ec660d57388d8d 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,6 +16,10 @@ class roles {
                include buildd
        }
 
+       if getfromhash($site::nodeinfo, 'porterbox') {
+               include porterbox
+       }
+
        if getfromhash($site::nodeinfo, 'bugs_mirror') {
                include roles::bugs_mirror
        }
@@ -54,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') {
@@ -71,6 +75,11 @@ class roles {
        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
        }