X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=cab8edd978da9f7b7fe44d5246ef519e5827ce40;hb=aaa8963b91de9a3cfc1b3d1fbfe06ac822be73a6;hp=81b668fde39d59ed624f78c5b5c72cebf0396fa8;hpb=75e631eaf68f569d032fbff644403acd35939206;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 81b668fde..cab8edd97 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') {
@@ -8,7 +16,7 @@ class roles {
 		include munin::master
 	}
 
-	if getfromhash($site::nodeinfo, 'nagiosmaster') {
+	if has_role('nagiosmaster') {
 	#	include nagios::server
 		ssl::service { 'nagios.debian.org':
 			notify => Service['apache2'],
@@ -29,19 +37,35 @@ class roles {
 		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
 	}
 
+	if has_role('api.ftp-master') {
+		ssl::service { 'api.ftp-master.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
 		include roles::security_mirror
 	}
 
-
-        # XXX: turn this into a real role
-        if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
+	# XXX: turn this into a real role
+	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
 		include roles::www_mirror
 	}
 
@@ -53,6 +77,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
@@ -103,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
@@ -123,6 +154,10 @@ class roles {
 		include roles::lists
 	}
 
+	if has_role('list_search') {
+		include roles::listsearch
+	}
+
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -131,10 +166,22 @@ class roles {
 		include roles::udd
 	}
 
+	if has_role('sso') {
+		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
 	}
@@ -150,4 +197,47 @@ 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,
+		}
+	}
+
+	if has_role('search_backend') {
+		include search_backend
+	}
+	if has_role('search_frontend') {
+		include search_frontend
+	}
 }