this is probably more like it

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

diff --git a/manifests/site.pp b/manifests/site.pp
index bec319b45644ae51dc6308f6f62f91a650867c36..77007e1075e710256d67607bcfcae39141f9fce5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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
        }
 }