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

diff --git a/manifests/site.pp b/manifests/site.pp
index 0dd85bea1..c54244da3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -37,7 +37,8 @@ node default {
 	include unbound
 	include bacula::client
 	include autofs
-	include lvm
+	include dsa_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 [geo3,wieck] {
 		include debian-org::radvd
 	}
 
@@ -137,3 +136,4 @@ node default {
 		}
 	}
 }
+