X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=4dcdb384d3aa72c9c49c8bb5a5b23202b885bf7c;hb=23b7b6241cf5fbe119eaa14a54fa1514be63feb6;hp=647f4576aecfb58db6cec2f5c3d1bf24fea0eea2;hpb=98293f6fb4e156b3c2f42024adec5d332c056bcf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 647f4576a..4dcdb384d 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,14 +8,18 @@ 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 getfromhash($site::nodeinfo, 'porterbox') {
+		include porterbox
+	}
+
 	if getfromhash($site::nodeinfo, 'bugs_mirror') {
 		include roles::bugs_mirror
 	}
@@ -33,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
 	}
@@ -45,11 +45,6 @@ class roles {
 		include roles::ftp_upload
 	}
 
-	if getfromhash($site::nodeinfo, 'backports_master') {
-		include roles::backports_master
-		include roles::dakmaster
-	}
-
 	if getfromhash($site::nodeinfo, 'security_master') {
 		include roles::security_master
 		include roles::dakmaster
@@ -63,7 +58,33 @@ class roles {
 		include roles::keyring
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
+	if getfromhash($site::nodeinfo, 'wiki') {
+		include roles::wiki
+	}
+
+	if getfromhash($site::nodeinfo, 'syncproxy') {
+		include roles::syncproxy
+	}
+
+	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
 	}
 }