X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=5b95b0c63d9e4e7053f1800d6f0a46e852444eb0;hb=247d0420a7d4f86809c6c7d49c7ba2b76f9ca8f3;hp=93749bfc1505f51c532bbe3966914e279cc9e2a0;hpb=991b6ec9c0c8ece2935c922b9c5c315ccde6deb8;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 93749bfc1..5b95b0c63 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,6 +38,7 @@ node default {
 	include bacula::client
 	include autofs
 	include lvm
+	include grub
 	include multipath
 	if $::lsbdistcodename == squeeze {
 		include roles::udldap::client
@@ -70,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -90,7 +89,7 @@ node default {
 	}
 
 	if $::apache2 {
-		if !$::hostname in [oyens] {
+		if !($::hostname in [oyens]) {
 			include apache2
 		}
 	}
@@ -119,7 +118,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [chopin,geo3,wieck] {
 		include debian-org::radvd
 	}
 
@@ -137,3 +136,4 @@ node default {
 		}
 	}
 }
+