X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=acde9e3992568a7a9c28fe5d06e114c0fb57a42d;hb=5be533af09c56eb072520089523d5f24d261c3a1;hp=11bf95821f625f6a06c6c624a890d3bfd2e261e6;hpb=6ee2086bdea86dc00c036e481b68ff063b400b6d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 11bf95821..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,10 +59,6 @@ node default {
 		include postfix
 	}
 
-	if $::lsbdistcodename != 'lenny' {
-		include unbound
-	}
-
 	if $::apache2 {
 		include apache2
 	}
@@ -75,8 +71,6 @@ node default {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
-	} elsif $::hostname == 'liszt' {
-		include named::recursor
 	}
 
 	if $::hostname in [diabelli,nono,spohr] {
@@ -108,8 +102,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin] {
-		include vsftpd
-	}
 }