X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=593be680be55db2c9dfe30b20012faf539f6ee2f;hb=103e56b48752f77fd66edd1824d82946570ca033;hp=19359263f4f61c2b5dcdd355ed54f224f97fa54a;hpb=7e9f3801f497c8f0a05094e04656f059fc903e56;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 19359263..593be680 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,6 +33,7 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
 
 	if $::hostname in [pasquini,tristano] {
 		include ganeti2
@@ -58,53 +59,7 @@ 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, 'ftp.d.o') {
-		include roles::ftp
-	}
-
-	if $::hostname in [bizet,morricone] {
-		include roles::backports_master
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
-	}
+	include unbound
 
 	if $::apache2 {
 		include apache2
@@ -118,8 +73,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] {
@@ -151,8 +104,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin,franck,ravel] {
-		include vsftpd
-	}
 }