X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6123122491d6661c7e8a7f66b40a7a283110f8fe;hb=0687092d91a1c26b9c56cfc847603e2216507bb1;hp=593be680be55db2c9dfe30b20012faf539f6ee2f;hpb=103e56b48752f77fd66edd1824d82946570ca033;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 593be680b..612312249 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -34,41 +34,41 @@ node default {
 	include nagios::client
 	include resolv
 	include roles
+	include unbound
 
 	if $::hostname in [pasquini,tristano] {
 		include ganeti2
 	}
 
+	if $::hostname == 'dinis' {
+		include bacula::director
+	}
+
 	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
+	} else {
+		include exim
 	}
 
-	include unbound
-
 	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] {