add ftp_upload role

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 75bac4c..bb8f2c2 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -54,7 +54,7 @@ node default {
                } else {
                        include exim
                }
-       } elsif $::hostname == 'bendel' {
+       } else {
                include postfix
        }
 
@@ -94,6 +94,18 @@ node default {
                include roles::backports_mirror
        }
 
+       if getfromhash($site::nodeinfo, 'ftp.d.o') {
+               include roles::ftp
+       }
+
+       if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+               include roles::ftp_upload
+       }
+
+       if $::hostname in [bizet,morricone] {
+               include roles::backports_master
+       }
+
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
                include roles::ftp-upcoming_mirror
        }
@@ -144,7 +156,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hostname in [chopin,franck,kassia,klecker,morricone,ravel,bizet] {
+       if $::hostname in [chopin,franck,ravel] {
                include vsftpd
        }
 }