X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=acde9e3992568a7a9c28fe5d06e114c0fb57a42d;hb=e4951b80994442be4318eaff1de4a856c85af59b;hp=54ed6528471689ca7c14819daf0f5fc6a6bb5a56;hpb=e3841f9f1bc67a248f63e393848a959526a531af;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 54ed65284..acde9e399 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,69 +33,32 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
+	include unbound
 
 	if $::hostname in [pasquini,tristano] {
 		include ganeti2
 	}
 
-	if $::hostname in [finzi,fano,fasch,field] {
+	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
 		} else {
 			include exim
 		}
-	} elsif $::hostname == 'bendel' {
+	} else {
 		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
 	}
@@ -108,14 +71,6 @@ node default {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
-	} elsif $::hostname == 'liszt' {
-		include named::recursor
-	}
-
-	if $::kernel == 'Linux' {
-		include ferm
-		include ferm::per-host
-		include entropykey
 	}
 
 	if $::hostname in [diabelli,nono,spohr] {
@@ -147,8 +102,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,villa,wieck,bizet] {
-		include vsftpd
-	}
 }