X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3ccacfe0b76384534e76921fb5b41f77c9d50582;hb=3f6e5777c3cd8a3e7751a0f96737f9bcad3a906a;hp=0dd85bea1ff2ed1101a3d4e8e9c443dae6a3f774;hpb=f647fba18769981e061119ea5a48a73ea0be8157;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 0dd85bea1..3ccacfe0b 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
@@ -90,7 +91,7 @@ node default {
 	}
 
 	if $::apache2 {
-		if $::hostname in ![oyens] {
+		if !($::hostname in [oyens]) {
 			include apache2
 		}
 	}
@@ -119,7 +120,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [chopin,geo3,wieck] {
 		include debian-org::radvd
 	}
 
@@ -137,3 +138,4 @@ node default {
 		}
 	}
 }
+