X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3aa5990985c37b4d78987b6c29701b2953db822e;hb=f9fb7de3c5967ecbef88e59a2f4b2ffe97edfc91;hp=8355c6947380d22dfb92524d15a3ba094821b681;hpb=9343a84a46edc4b6f8c1c24bbb48b9522fa21f3c;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 8355c6947..3aa599098 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
@@ -62,46 +63,6 @@ node default {
 		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 $::hostname in [bizet,morricone] {
-		include roles::backports_master
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
-	}
-
 	if $::apache2 {
 		include apache2
 	}
@@ -148,7 +109,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::hostname in [chopin,franck,kassia,klecker,ravel] {
+	if $::hostname in [chopin,franck,ravel] {
 		include vsftpd
 	}
 }