add ftp_upload role

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

diff --git a/manifests/site.pp b/manifests/site.pp
index a55107b..bb8f2c2 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,10 +3,10 @@ Package {
 }
 
 File {
-       owner   => root,
-       group   => root,
-       mode    => '0444',
-       ensure  => file,
+       owner  => root,
+       group  => root,
+       mode   => '0444',
+       ensure => file,
 }
 
 Exec {
@@ -26,7 +26,6 @@ node default {
        include ssh
        include debian-org
        include monit
-       include apt-keys
        include ntp
        include ntpdate
        include ssl
@@ -35,7 +34,13 @@ node default {
        include nagios::client
        include resolv
 
-       if $::hostname in [finzi,fano,fasch,field] {
+       if $::hostname in [pasquini,tristano] {
+               include ganeti2
+       }
+
+       if $::kernel == Linux {
+               include linux
+       } elsif $::kernel == 'GNU/kFreeBSD' {
                include kfreebsd
        }
 
@@ -49,6 +54,8 @@ node default {
                } else {
                        include exim
                }
+       } else {
+               include postfix
        }
 
        if $::lsbdistcodename != 'lenny' {
@@ -87,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
        }
@@ -107,12 +126,6 @@ node default {
                include named::recursor
        }
 
-       if $::kernel == 'Linux' {
-               include ferm
-               include ferm::per-host
-               include entropykey
-       }
-
        if $::hostname in [diabelli,nono,spohr] {
                include dacs
        }
@@ -143,13 +156,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::vsftpd {
-               package { 'logtail':
-                       ensure => installed
-               }
-               munin::check { 'vsftpd': }
-               munin::check { 'ps_vsftpd':
-                       script => 'ps_'
-               }
+       if $::hostname in [chopin,franck,ravel] {
+               include vsftpd
        }
 }