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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b79a090aa..3d69c3fa7 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -75,6 +75,12 @@ class roles {
 		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
@@ -125,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
@@ -157,6 +160,10 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('tracker') {
+		include roles::tracker
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}
@@ -181,6 +188,10 @@ class roles {
 		include roles::rtc
 	}
 
+	if has_role('keystone') {
+		include roles::keystone
+	}
+
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -191,6 +202,18 @@ class roles {
 		}
 	}
 
+	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,