X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=3eb5dfdb5f2bf51c87d6391cb3c23267427088a2;hb=8bb003cb1bb6c12b3909547aae210a46b609d0cd;hp=81b668fde39d59ed624f78c5b5c72cebf0396fa8;hpb=75e631eaf68f569d032fbff644403acd35939206;p=dsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 81b668fd..3eb5dfdb 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,6 +29,17 @@ class roles {
 		include roles::bugs_mirror
 	}
 
+	if has_role('bugs_base') {
+		ssl::service { 'bugs.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+	if has_role('bugs_master') {
+		ssl::service { 'bugs-master.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
@@ -39,9 +50,8 @@ class roles {
 		include roles::security_mirror
 	}
 
-
-        # XXX: turn this into a real role
-        if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
 		include roles::www_mirror
 	}
 
@@ -131,6 +141,10 @@ class roles {
 		include roles::udd
 	}
 
+	if has_role('sso') {
+		include roles::sso
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}
@@ -150,4 +164,18 @@ class roles {
 	if has_role('release') {
 		include roles::release
 	}
+
+	if has_role('rtc') {
+		include roles::rtc
+	}
+
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
+	}
+
+	if has_role('packages') {
+		ssl::service { 'packages.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }