X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=be13ab72738fb57cbabc0e4af0dd705c848f04df;hb=14060b9077bf8934a0670e00bec6068f714e28e2;hp=0089f12084004084a1ef73ce7a8fa8b3de515d1e;hpb=1402f2d5fb51abbf4fe58a5b3085e3fc1a0b596e;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 0089f120..be13ab72 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,61 +33,30 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
+	include unbound
 
-	if $::hostname in [finzi,fano,fasch,field] {
-		include kfreebsd
+	if $::hostname in [pasquini,tristano] {
+		include ganeti2
 	}
 
-	if $::kvmdomain {
-		include acpi
+	if $::kernel == Linux {
+		include linux
+		if $::kvmdomain {
+			include acpi
+		}
+	} elsif $::kernel == 'GNU/kFreeBSD' {
+		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
 		if getfromhash($site::nodeinfo, 'heavy_exim') {
 			include exim::mx
-		} else {
-			include exim
 		}
-	}
-
-	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
+	} elsif $::mta == 'postfix' {
+		include postfix
+	} else {
+		include exim
 	}
 
 	if $::apache2 {
@@ -102,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] {
@@ -141,14 +102,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::vsftpd {
-		package { 'logtail':
-			ensure => installed
-		}
-		munin::check { 'vsftpd': }
-		munin::check { 'ps_vsftpd':
-			script => 'ps_'
-		}
-	}
 }