X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=8a5e19dac35ae81d78e07e0bd53e6493aaae15d8;hb=e6a85fcf8e062dda759389a18b3eb46ea4a88631;hp=261f84f8495276b95abd50cedefab5d5134a3a43;hpb=f833a1c122597f80da4d4095cae8d7d5bd852a7a;p=dsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 261f84f8..8a5e19da 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,18 +8,20 @@ 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'],
 		}
 	}
 
-	if has_role('buildd') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'buildd') {
 		include buildd
 	}
 
-	if has_role('porterbox') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'porterbox') {
 		include porterbox
 	}
 
@@ -27,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
 	}
 
@@ -126,6 +136,10 @@ class roles {
 		include roles::udd
 	}
 
+	if has_role('sso') {
+		include roles::sso
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}