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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 213f336c3..edf4d3e9f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -154,9 +154,9 @@ class roles {
 		include roles::lists
 	}
 
-	#if has_role('list_search') {
-	#	include roles::listsearch
-	#}
+	if has_role('list_search') {
+		include roles::listsearch
+	}
 
 	if has_role('rtmaster') {
 		include roles::rtmaster
@@ -205,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
@@ -230,7 +237,7 @@ class roles {
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org':
-			tlsaport => 0,
+			notify => Service['apache2'],
 		}
 	}
 
@@ -240,4 +247,11 @@ class roles {
 	if has_role('search_frontend') {
 		include search_frontend
 	}
+
+	if has_role('dgit_browse') {
+		include dgit_browse
+	}
+	if has_role('dgit_git') {
+		include dgit_git
+	}
 }