X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=fb46df79aefb892c7ad0393a054cddd96a713a1c;hb=6a59b7f5b40a60504425a237d404837345aa358b;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..fb46df79a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -53,6 +53,12 @@ class roles {
 		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
@@ -63,6 +69,10 @@ class roles {
 		include roles::www_mirror
 	}
 
+	if has_role('mirror_debug') {
+		include roles::debug_mirror
+	}
+
 	if has_role('ftp.d.o') {
 		include roles::ftp
 	}
@@ -71,10 +81,20 @@ class roles {
 		include roles::ftp_upload
 	}
 
+	if has_role('ssh.upload.d.o') {
+		include roles::ssh_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
@@ -125,9 +145,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
@@ -145,6 +162,10 @@ class roles {
 		include roles::lists
 	}
 
+	if has_role('list_search') {
+		include roles::listsearch
+	}
+
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -157,10 +178,22 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('sso_rp') {
+		include roles::sso_rp
+	}
+
+	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 +214,21 @@ class roles {
 		include roles::rtc
 	}
 
+	if has_role('jenkins') {
+		include roles::jenkins
+	}
+
+	if has_role('keystone') {
+		include roles::keystone
+	}
+	if has_role('keystone_rabbitmq') {
+		include roles::keystone::rabbitmq
+	}
+
+	if has_role('memcached') {
+		include roles::memcached
+	}
+
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -190,4 +238,46 @@ 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':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('search_backend') {
+		include search_backend
+	}
+	if has_role('search_frontend') {
+		include search_frontend
+	}
+
+	if has_role('dgit_browse') {
+		include dgit_browse
+	}
+	if has_role('dgit_git') {
+		include dgit_git
+	}
+
+	if $::hostname in [lw01, lw02, lw03, lw04] {
+		include snapshot
+	}
+
+	if has_role('veyepar.debian.org') {
+		ssl::service { 'veyepar.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }