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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 249dde669..5ec93d16a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -30,7 +30,13 @@ class roles {
 
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'porterbox') {
-		include porterbox
+		class {'porterbox':
+			ensure => present,
+		}
+	} else {
+		class {'porterbox':
+			ensure => absent,
+		}
 	}
 
 	if has_role('bugs_mirror') {
@@ -75,6 +81,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 +137,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 +166,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
 	}
@@ -181,6 +198,10 @@ class roles {
 		include roles::rtc
 	}
 
+	if has_role('keystone') {
+		include roles::keystone
+	}
+
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -190,4 +211,22 @@ class roles {
 			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,
+		}
+	}
 }