X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=843342b348003716472a58fa56ee44f25a1dec1b;hb=6b4b367c4bad827e3917fc6622e01f847f49ce14;hp=be8f3ab45353d8a984c32843232637e4454e80ff;hpb=8e104735c829bddd66c9f0aacfa0f41e92eed57d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index be8f3ab45..843342b34 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -20,6 +20,7 @@ class roles {
 	#	include nagios::server
 		ssl::service { 'nagios.debian.org':
 			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 
@@ -58,6 +59,7 @@ class roles {
 	if has_role('api.ftp-master') {
 		ssl::service { 'api.ftp-master.debian.org':
 			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 
@@ -90,7 +92,7 @@ class roles {
 
 	if has_role('people') {
 		ssl::service { 'people.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-		onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, }
+		onion::service { 'people.debian.org': port => 80, target_address => 'people.debian.org', target_port => 80, direct => true }
 	}
 
 	if has_role('security_master') {
@@ -204,10 +206,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
-
 	if has_role('rtc') {
 		include roles::rtc
 	}