X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=aaeacee6ab26c052b76236a557dc0d7121cc591b;hb=b10d9a43f202eb53dd1ff0d6522ed4f3373f2260;hp=ede7f9b1d5ce3434f403dde3f688ed3955798b6c;hpb=d6e20ea4c083d9978ad4c3e5eccaffa2e887698a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ede7f9b1d..aaeacee6a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,9 +8,9 @@ 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
@@ -73,5 +73,7 @@ class roles {
 
 	if getfromhash($site::nodeinfo, 'static_mirror') {
 		include roles::static_mirror
+	} elsif getfromhash($site::nodeinfo, 'static_source') {
+		include roles::static_source
 	}
 }