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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a4a6cf08b..d53406897 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -58,6 +58,10 @@ class roles {
 		include roles::keyring
 	}
 
+	if getfromhash($site::nodeinfo, 'wiki') {
+		include roles::wiki
+	}
+
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
 		include roles::ftp-upcoming_mirror
 	}
@@ -75,6 +79,11 @@ class roles {
 	if getfromhash($site::nodeinfo, 'weblog_provider') {
 		include roles::weblog_provider
 	}
+
+	if getfromhash($site::nodeinfo, 'mailrelay') {
+		include roles::mailrelay
+	}
+
 	if $::hostname in [ravel] {
 		include roles::weblog_destination
 	}