X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=843342b348003716472a58fa56ee44f25a1dec1b;hb=14dbe81b92fcbc6ca8328d8fb39293761297b4bf;hp=40e6e3942765aace3189723be4fe351340959132;hpb=2b73b23a1a6400494949bf864a1b59450c9e72e7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 40e6e3942..843342b34 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,14 +44,11 @@ class roles {
 
 	if has_role('bugs_base') {
 		ssl::service { 'bugs.debian.org':
-			notify => Service['apache2'],
+			notify  => Exec['service apache2 reload'],
 		}
 	}
 	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') {
@@ -60,15 +58,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,
-		}
+		ssl::service { 'manpages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
 	if has_role('security_mirror') {
@@ -95,10 +91,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') {
@@ -111,10 +105,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') {
@@ -215,10 +206,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
-
 	if has_role('rtc') {
 		include roles::rtc
 	}
@@ -243,32 +230,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') {
@@ -290,10 +264,7 @@ 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('httpredir') {
@@ -305,42 +276,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') {
@@ -351,11 +304,7 @@ class roles {
 	}
 
 	if $::hostname in [klecker] {
-		onion::service { 'ftp.debian.org':
-			port => 80,
-			target_address => '130.89.148.12',
-			target_port => 81,
-		}
+		onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
 	}
 	if has_role('onionbalance') {
 		include onion::balance