X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8b8fe5e4eb420b8848d56a279d425fe19f407c3d;hb=cec54898adf14b81a534630f029f66995b4cf272;hp=3aa5990985c37b4d78987b6c29701b2953db822e;hpb=7abe65323c6bf5909c19fa7766af23048559c79d;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 3aa59909..8b8fe5e4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -34,49 +34,53 @@ node default {
 	include nagios::client
 	include resolv
 	include roles
+	include unbound
 
-	if $::hostname in [pasquini,tristano] {
+	if $::hostname in [pasquini,tristano,bertali,boito] {
 		include ganeti2
 	}
 
+	if $::hostname == 'dinis' {
+		include bacula::director
+	}
+
+	if $::hostname in [berlioz] {
+		include bacula::client
+	}
+
+	if $::hostname == 'beethoven' {
+		include bacula::storage
+	}
+
 	if $::kernel == Linux {
 		include linux
+		if $::kvmdomain {
+			include acpi
+		}
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
 
-	if $::kvmdomain {
-		include acpi
-	}
-
 	if $::mta == 'exim4' {
 		if getfromhash($site::nodeinfo, 'heavy_exim') {
 			include exim::mx
 		} else {
 			include exim
 		}
-	} else {
+	} elsif $::mta == 'postfix' {
 		include postfix
-	}
-
-	if $::lsbdistcodename != 'lenny' {
-		include unbound
+	} else {
+		include exim
 	}
 
 	if $::apache2 {
 		include apache2
 	}
 
-	if $::rsyncd {
-		include rsyncd-log
-	}
-
 	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
-	} elsif $::hostname == 'liszt' {
-		include named::recursor
 	}
 
 	if $::hostname in [diabelli,nono,spohr] {
@@ -108,8 +112,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin,franck,ravel] {
-		include vsftpd
-	}
 }