X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=8159e8cd130f3ff41a1848551519477f858318ae;hb=5022b517840424d7ca7fb87b9c5868d91f83db5d;hp=29beab5c077faee0d6c00a5da54e7670a3e90e8a;hpb=f036067f9edca6bce895e793333381b77d68581a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 29beab5c0..8159e8cd1 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,7 +8,7 @@ class roles {
 		include munin::master
 	}
 
-	if getfromhash($site::nodeinfo, 'nagiosmaster') {
+	if has_role('nagiosmaster') {
 	#	include nagios::server
 		ssl::service { 'nagios.debian.org':
 			notify => Service['apache2'],
@@ -29,16 +29,24 @@ class roles {
 		include roles::bugs_mirror
 	}
 
+	if has_role('bugs_base') {
+		ssl::service { 'bugs.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
 	}
 
-	if has_role('apache2_security_mirror') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
 		include roles::security_mirror
 	}
 
-	if has_role('apache2_www_mirror') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
 		include roles::www_mirror
 	}
 
@@ -128,6 +136,10 @@ class roles {
 		include roles::udd
 	}
 
+	if has_role('sso') {
+		include roles::sso
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}
@@ -147,4 +159,8 @@ class roles {
 	if has_role('release') {
 		include roles::release
 	}
+
+	if has_role('sip') {
+		include roles::sip
+	}
 }