X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=edf4d3e9fab7c107db1081be60650dafdaef5dad;hb=81d30ab85281bca85a4b6d91723ac0a1a0157fa6;hp=3d69c3fa7760f8aac9105158479cba33bbeacc05;hpb=15aa6d365d36130a4ccc1832e98edf02260d9fd8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3d69c3fa7..edf4d3e9f 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
@@ -148,6 +154,10 @@ class roles {
 		include roles::lists
 	}
 
+	if has_role('list_search') {
+		include roles::listsearch
+	}
+
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -168,6 +178,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
 	}
@@ -191,6 +205,13 @@ class roles {
 	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
@@ -216,7 +237,21 @@ 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
+	}
 }