X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=3d69c3fa7760f8aac9105158479cba33bbeacc05;hb=1d58862054f8e4aff11a0c94a1276e38f4740972;hp=8159e8cd130f3ff41a1848551519477f858318ae;hpb=c62ab4ee21cc59c683a950c037315c57040db4f5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8159e8cd1..3d69c3fa7 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') {
@@ -34,6 +42,11 @@ class roles {
 			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
@@ -58,6 +71,16 @@ class roles {
 		include roles::ftp_upload
 	}
 
+	if has_role('git_master') {
+		include roles::git_master
+	}
+
+	if has_role('people') {
+		ssl::service { 'people.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	if has_role('security_master') {
 		include roles::security_master
 		include roles::dakmaster
@@ -108,9 +131,6 @@ class roles {
 	if has_role('dns_primary') {
 		include named::primary
 	}
-	if has_role('dns_secondary') {
-		include named::authoritative
-	}
 
 	if has_role('weblog_destination') {
 		include roles::weblog_destination
@@ -140,6 +160,10 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('tracker') {
+		include roles::tracker
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}
@@ -160,7 +184,39 @@ class roles {
 		include roles::release
 	}
 
-	if has_role('sip') {
-		include roles::sip
+	if has_role('rtc') {
+		include roles::rtc
+	}
+
+	if has_role('keystone') {
+		include roles::keystone
+	}
+
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
+	}
+
+	if has_role('packages') {
+		ssl::service { 'packages.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('qamaster') {
+		ssl::service { 'qa.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('packagesqamaster') {
+		ssl::service { 'packages.qa.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('gobby_debian_org') {
+		ssl::service { 'gobby.debian.org':
+			tlsaport => 0,
+		}
 	}
 }