X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=18e237725243f0cbf1eab1380fb31c077b932e8b;hb=e2c327b2baae33e94eb530f7ee0d571abf2cd1e8;hp=deeccd91c8fce036c9a48b8dcfcae94753b5e6be;hpb=58b867b10275e400ca5df35d78bf8bb21bc6713d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index deeccd91c..18e237725 100644
--- 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' {