X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=54ed6528471689ca7c14819daf0f5fc6a6bb5a56;hb=0a6e92d24a867ec0ee2a0bbe22f9d7c540f4e3fd;hp=a55107b4cffe8259c4cc45d8090fa4db395ac708;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a55107b4c..54ed65284 100644
--- 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,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,villa,wieck,bizet] {
+		include vsftpd
 	}
 }