this is probably more like it

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

diff --git a/manifests/site.pp b/manifests/site.pp
index a55107b4cffe8259c4cc45d8090fa4db395ac708..77007e1075e710256d67607bcfcae39141f9fce5 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,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
        }
@@ -49,6 +52,8 @@ node default {
                } else {
                        include exim
                }
+       } elsif $::hostname == 'bendel' {
+               include postfix
        }
 
        if $::lsbdistcodename != 'lenny' {
@@ -143,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
        }
 }