X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=acde9e3992568a7a9c28fe5d06e114c0fb57a42d;hb=51a7173ff33621ad8f203107d559fc495c91e756;hp=2b7949b67f0152bef84955354ada9aafc539323f;hpb=ac3c6e91ccb34aba54840da7f32cfc7c51f6ffb2;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 2b7949b6..acde9e39 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,6 +33,8 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
+	include unbound
 
 	if $::hostname in [pasquini,tristano] {
 		include ganeti2
@@ -40,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
@@ -58,46 +59,6 @@ node default {
 		include postfix
 	}
 
-	if $::lsbdistcodename != 'lenny' {
-		include unbound
-	}
-
-	if getfromhash($site::nodeinfo, 'puppetmaster') {
-		include puppetmaster
-	}
-
-	if getfromhash($site::nodeinfo, 'muninmaster') {
-		include munin::master
-	}
-
-	if getfromhash($site::nodeinfo, 'nagiosmaster') {
-		include nagios::server
-	}
-
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
-	}
-
-	if $::hostname in [chopin,franck,morricone,bizet] {
-		include roles::dakmaster
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-		include roles::security_mirror
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-		include roles::backports_mirror
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
-	}
-
 	if $::apache2 {
 		include apache2
 	}
@@ -110,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] {
@@ -143,8 +102,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin,franck,kassia,klecker,ravel] {
-		include vsftpd
-	}
 }