X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=063a748e4954aa1f02540037839fce8aac96f6f1;hb=aa94c10edc643747502e42bd5608cead4e48218f;hp=c83884e5f6580d7f7b92bb1085cbbf5405fbea17;hpb=56c7d5499155eed311b157f4219ffd9755b54cdf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index c83884e5f..063a748e4 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -31,6 +31,14 @@ class roles {
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'porterbox') {
 		include porterbox
+		class {'porterbox':
+			ensure => present,
+		}
+	} else {
+		include porterbox
+		class {'porterbox':
+			ensure => absent,
+		}
 	}
 
 	if has_role('bugs_mirror') {
@@ -75,6 +83,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 +139,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,10 +168,18 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('tracker') {
+		include roles::tracker
+	}
+
 	if has_role('buildd_master') {
 		include roles::buildd_master
 	}
 
+	if has_role('buildd_ports_master') {
+		include roles::buildd_ports_master
+	}
+
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -195,6 +214,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,