X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=835f156812c751bd5c2406c5e8dd0ec89b5e579f;hb=142d7dd48ee282fc7cab2c036327dca1f4d87b07;hp=e7369d450bb96c294fb19a9c146cbad33c0ecb2b;hpb=171b3474d975c2faa3d48fa31654b8ab5981b4d4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e7369d450..835f15681 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,
 		}
 	}
 
@@ -44,6 +45,7 @@ class roles {
 	if has_role('bugs_base') {
 		ssl::service { 'bugs.debian.org':
 			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 	if has_role('bugs_master') {
@@ -58,11 +60,12 @@ class roles {
 	if has_role('api.ftp-master') {
 		ssl::service { 'api.ftp-master.debian.org':
 			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 
-	if has_role('manpages') {
-		ssl::service { 'manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+	if has_role('manpages-dyn') {
+		include roles::manpages_dyn
 	}
 
 	if has_role('security_mirror') {
@@ -91,7 +94,6 @@ 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, direct => true }
-		apache2::pin { 'people.debian.org': }
 	}
 
 	if has_role('security_master') {
@@ -205,10 +207,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
-
 	if has_role('rtc') {
 		include roles::rtc
 	}
@@ -269,6 +267,9 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
+	if has_role('sreview.debian.org') {
+		ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+	}
 
 	if has_role('httpredir') {
 		include roles::httpredir