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

diff --git a/manifests/site.pp b/manifests/site.pp
index a5c0ced31..5b95b0c63 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -71,9 +71,7 @@ node default {
 
 	if $::kernel == Linux {
 		include linux
-		if $::kvmdomain {
-			include acpi
-		}
+		include acpi
 	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
@@ -120,7 +118,7 @@ node default {
 		include samhain
 	}
 
-	if $::hostname in [chopin,geo3,soler,wieck] {
+	if $::hostname in [chopin,geo3,wieck] {
 		include debian-org::radvd
 	}