X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=20304d2580fb037080503591b36dc6485e5b361e;hb=f9367a72e7c03c652700668e10c7314ee1bd4124;hp=d4bc6834504f7af8b7fa845be2e72e58a593ecd2;hpb=905d0f36f829eb14e110bb972e5c72249b61cb0d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d4bc68345..20304d258 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,6 +16,10 @@ 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
@@ -51,7 +55,25 @@ 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
 	}
+
+	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
+	}
 }