this is probably more like it

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

diff --git a/manifests/site.pp b/manifests/site.pp
index deeccd91c8fce036c9a48b8dcfcae94753b5e6be..77007e1075e710256d67607bcfcae39141f9fce5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,10 +1,8 @@
 Package {
-       noop    => true,
        require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-       noop   => true,
        owner  => root,
        group  => root,
        mode   => '0444',
@@ -12,12 +10,10 @@ File {
 }
 
 Exec {
-       noop => true,
        path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
 Service {
-       noop       => true,
        hasrestart => true,
        hasstatus  => true,
 }
@@ -38,6 +34,10 @@ node default {
        include nagios::client
        include resolv
 
+       if $::hostname in [pasquini,tristano] {
+               include ganeti2
+       }
+
        if $::hostname in [finzi,fano,fasch,field] {
                include kfreebsd
        }
@@ -52,6 +52,8 @@ node default {
                } else {
                        include exim
                }
+       } elsif $::hostname == 'bendel' {
+               include postfix
        }
 
        if $::lsbdistcodename != 'lenny' {
@@ -146,13 +148,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,kassia,klecker,morricone,ravel,bizet] {
+               include vsftpd
        }
 }