X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=4c8668471154fb97fd8e8ba1bdc838da9945a5ee;hb=6a94b204599f27a5ec786e03242b594fb51bc7fc;hp=cab8edd978da9f7b7fe44d5246ef519e5827ce40;hpb=47e66c55978a019774cdbfa777be7bbcec325863;p=dsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index cab8edd9..4c866847 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -77,6 +77,10 @@ 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
 	}
@@ -205,6 +209,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 +241,7 @@ class roles {
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org':
-			tlsaport => 0,
+			notify => Service['apache2'],
 		}
 	}
 
@@ -240,4 +251,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
+	}
 }