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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7af3d2035..835f15681 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -19,7 +19,8 @@ class roles {
 	if has_role('nagiosmaster') {
 	#	include nagios::server
 		ssl::service { 'nagios.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 
@@ -43,11 +44,12 @@ class roles {
 
 	if has_role('bugs_base') {
 		ssl::service { 'bugs.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 	if has_role('bugs_master') {
-		ssl::service { 'bugs-master.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('ftp_master') {
@@ -57,12 +59,13 @@ class roles {
 
 	if has_role('api.ftp-master') {
 		ssl::service { 'api.ftp-master.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
+			key => true,
 		}
 	}
 
-	if has_role('manpages') {
-		ssl::service { 'manpages.debian.org': notify => Service['apache2'], key => true, }
+	if has_role('manpages-dyn') {
+		include roles::manpages_dyn
 	}
 
 	if has_role('security_mirror') {
@@ -89,7 +92,8 @@ class roles {
 	}
 
 	if has_role('people') {
-		ssl::service { 'people.debian.org': notify => Service['apache2'], key => true, }
+		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 }
 	}
 
 	if has_role('security_master') {
@@ -102,7 +106,7 @@ class roles {
 	}
 
 	if has_role('cgi.d.o') {
-		ssl::service { 'cgi.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('keyring') {
@@ -203,10 +207,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
-
 	if has_role('rtc') {
 		include roles::rtc
 	}
@@ -231,19 +231,19 @@ class roles {
 	}
 
 	if has_role('packages') {
-		ssl::service { 'packages.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('qamaster') {
-		ssl::service { 'qa.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('packagesqamaster') {
-		ssl::service { 'packages.qa.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('gobby_debian_org') {
-		ssl::service { 'gobby.debian.org': notify => Service['apache2'], key => true, tlsaport => [443, 6523], }
+		ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
 	}
 
 	if has_role('search_backend') {
@@ -265,7 +265,10 @@ class roles {
 	}
 
 	if has_role('veyepar.debian.org') {
-		ssl::service { 'veyepar.debian.org': notify => Service['apache2'], key => true, }
+		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') {
@@ -277,24 +280,24 @@ class roles {
 	}
 
 	if has_role('planet_search') {
-		ssl::service { 'planet-search.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('i18n.d.o') {
-		ssl::service { 'i18n.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('l10n.d.o') {
-		ssl::service { 'l10n.debian.org': notify => Service['apache2'], key => true, }
+		ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('dedup.d.n') {
-		ssl::service { 'dedup.debian.net': notify => Service['apache2'], key => true, }
+		ssl::service { 'dedup.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('pet.d.n') {
-		ssl::service { 'pet.debian.net': notify => Service['apache2'], key => true, }
-		ssl::service { 'pet-devel.debian.net': notify => Service['apache2'], key => true, }
+		ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+		ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('ports-master') {