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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4a862f713..063a748e4 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') {
@@ -23,12 +31,31 @@ 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') {
 		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
@@ -52,6 +79,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
@@ -102,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
@@ -134,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
 	}
@@ -153,4 +195,40 @@ class roles {
 	if has_role('release') {
 		include roles::release
 	}
+
+	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,
+		}
+	}
 }