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

diff --git a/manifests/site.pp b/manifests/site.pp
index 593be680b..acde9e399 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -34,6 +34,7 @@ node default {
 	include nagios::client
 	include resolv
 	include roles
+	include unbound
 
 	if $::hostname in [pasquini,tristano] {
 		include ganeti2
@@ -41,14 +42,13 @@ node default {
 
 	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
@@ -59,8 +59,6 @@ node default {
 		include postfix
 	}
 
-	include unbound
-
 	if $::apache2 {
 		include apache2
 	}