X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=aaeacee6ab26c052b76236a557dc0d7121cc591b;hb=432da1dae7fc3bd13f91fed6cb9a3b02baafa4eb;hp=a8f745ab1dddcb2596c3cce4311a239c6acf4efc;hpb=02b706b6a3a4660bc98181c05d81671878cd8557;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a8f745ab1..aaeacee6a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,16 +8,16 @@ 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, 'bugs_search') {
-		include roles::bugs_search
+	if getfromhash($site::nodeinfo, 'bugs_mirror') {
+		include roles::bugs_mirror
 	}
 
 	if getfromhash($site::nodeinfo, 'ftp_master') {
@@ -66,4 +66,14 @@ class roles {
 	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
+	}
 }