X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=aaada6438657f3c20904820f77568ecbaf1c9b1f;hp=9caaa5b0b9adac36223f021966b9343b60adbdb1;hb=bf944940ea5403b79bb6aa927c108ec3429082dc;hpb=525dd7743f792944eb3aa7551e2059f83d9fc4dd

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 9caaa5b0..aaada643 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
@@ -71,10 +77,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
@@ -142,6 +158,10 @@ class roles {
 		include roles::lists
 	}
 
+	if has_role('list_search') {
+		include roles::listsearch
+	}
+
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -154,6 +174,10 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('sso_rp') {
+		include roles::sso_rp
+	}
+
 	if has_role('tracker') {
 		include roles::tracker
 	}
@@ -162,6 +186,10 @@ class roles {
 		include roles::buildd_master
 	}
 
+	if has_role('buildd_ports_master') {
+		include roles::buildd_ports_master
+	}
+
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -182,9 +210,20 @@ 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
@@ -210,7 +249,31 @@ class roles {
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org':
-			tlsaport => 0,
+			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'],
 		}
 	}
 }