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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2bdae0d38..647f4576a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,7 +16,12 @@ class roles {
 		include buildd
 	}
 
+	if getfromhash($site::nodeinfo, 'bugs_mirror') {
+		include roles::bugs_mirror
+	}
+
 	if getfromhash($site::nodeinfo, 'ftp_master') {
+		include roles::ftp_master
 		include roles::dakmaster
 	}
 
@@ -50,6 +55,14 @@ class roles {
 		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
 	}