X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a8f745ab1dddcb2596c3cce4311a239c6acf4efc;hb=c429f34b4841fc1c41eac251fc2e9203704b1164;hp=437a5a508df606b1d8bd0f31e0998af27d5f5a0e;hpb=59a2cc3e48fbcae69ea87ed198e46d6b8a6859c8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 437a5a508..a8f745ab1 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -55,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
 	}