X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=249dde66973dde55bd610f8dd615645ce76c9018;hb=76790b983062c130c7a9442c44cd169ef25c4161;hp=f16846cfaf0e6aa69b723d2f15160e4e493f2725;hpb=729e6d78e4d1171c0bf9523e314376510446f56b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index f16846cfa..249dde669 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+#   include roles
+#
 class roles {
 
 	if has_role('puppetmaster') {
@@ -8,7 +16,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'],
@@ -20,7 +28,8 @@ class roles {
 		include buildd
 	}
 
-	if has_role('porterbox') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'porterbox') {
 		include porterbox
 	}
 
@@ -28,16 +37,29 @@ 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
 	}
 
-	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
 	}
 
@@ -49,6 +71,10 @@ class roles {
 		include roles::ftp_upload
 	}
 
+	if has_role('git_master') {
+		include roles::git_master
+	}
+
 	if has_role('security_master') {
 		include roles::security_master
 		include roles::dakmaster
@@ -127,6 +153,10 @@ class roles {
 		include roles::udd
 	}
 
+	if has_role('sso') {
+		include roles::sso
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}
@@ -146,4 +176,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'],
+		}
+	}
 }