X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=fad6b087a436751f643a1ef183d5263ec6fb78dd;hb=4829b0b43f9f70db0f7ce2ca987d787da41f4d39;hp=601e14400f35b782ddb9fde7734712ff811a8028;hpb=6f2b99d1b77cb7edefdeb8ed407139ef4c2bf447;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 601e14400..fad6b087a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,15 +8,24 @@ class roles {
 		include munin::master
 	}
 
-	if getfromhash($site::nodeinfo, 'nagiosmaster') {
-		include nagios::server
-	}
+	#if getfromhash($site::nodeinfo, 'nagiosmaster') {
+	#	include nagios::server
+	#}
 
 	if getfromhash($site::nodeinfo, 'buildd') {
 		include buildd
 	}
 
-	if $::hostname in [chopin,franck,morricone,bizet] {
+	if getfromhash($site::nodeinfo, 'porterbox') {
+		include porterbox
+	}
+
+	if getfromhash($site::nodeinfo, 'bugs_mirror') {
+		include roles::bugs_mirror
+	}
+
+	if getfromhash($site::nodeinfo, 'ftp_master') {
+		include roles::ftp_master
 		include roles::dakmaster
 	}
 
@@ -28,10 +37,6 @@ class roles {
 		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
 	}
@@ -40,15 +45,42 @@ class roles {
 		include roles::ftp_upload
 	}
 
-	if $::hostname in [bizet,morricone] {
-		include roles::backports_master
-	}
-
 	if getfromhash($site::nodeinfo, 'security_master') {
 		include roles::security_master
+		include roles::dakmaster
+	}
+
+	if getfromhash($site::nodeinfo, 'www_master') {
+		include roles::www_master
+	}
+
+	if getfromhash($site::nodeinfo, 'keyring') {
+		include roles::keyring
 	}
 
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
 		include roles::ftp-upcoming_mirror
 	}
+
+	if getfromhash($site::nodeinfo, 'static_master') {
+		include roles::static_master
+	}
+
+	if getfromhash($site::nodeinfo, 'static_mirror') {
+		include roles::static_mirror
+	} elsif getfromhash($site::nodeinfo, 'static_source') {
+		include roles::static_source
+	}
+
+	if getfromhash($site::nodeinfo, 'weblog_provider') {
+		include roles::weblog_provider
+	}
+
+	if getfromhash($site::nodeinfo, 'mailrelay') {
+		include roles::mailrelay
+	}
+
+	if $::hostname in [ravel] {
+		include roles::weblog_destination
+	}
 }