X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=ead009c093b748f03c33d3adab43559269d39d69;hb=1ab297e177f78afa9ae4ff44ba3110fbec30beee;hp=1327cb68e6438640972e34307f4db28da9386b2f;hpb=12204de39f057ca4d404f1ccca2ab03f05b38f63;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1327cb68e..ead009c09 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,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') {
@@ -60,23 +59,25 @@ 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
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
-
-	if has_role('mirror_debug') {
+	if has_role('historical_mirror') {
+		include roles::historical_mirror
+	}
+	if has_role('debian_mirror') {
+		include roles::debian_mirror
+	}
+	if has_role('debug_mirror') {
 		include roles::debug_mirror
 	}
 
@@ -97,9 +98,8 @@ class roles {
 	}
 
 	if has_role('people') {
-		ssl::service { 'people.debian.org':
-			notify => Service['apache2'],
-		}
+		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') {
@@ -112,10 +112,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') {
@@ -216,10 +213,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
-
 	if has_role('rtc') {
 		include roles::rtc
 	}
@@ -244,29 +237,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'],
-		}
+		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'],
-		}
+		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,
-		}
+		ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
 	}
 
 	if has_role('search_backend') {
@@ -288,9 +271,10 @@ class roles {
 	}
 
 	if has_role('veyepar.debian.org') {
-		ssl::service { 'veyepar.debian.org':
-			notify => Service['apache2'],
-		}
+		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') {
@@ -302,41 +286,43 @@ 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') {
+		include roles::ports_master
+	}
+	if has_role('ports_mirror') {
+		include roles::ports_mirror
+	}
+
+	if $::hostname in [klecker] {
+		onion::service { 'ftp.debian.org': port => 80, target_address => '130.89.148.12', target_port => 81, }
+	}
+	if has_role('onionbalance') {
+		include onion::balance
+	}
+	if has_role('bgp') {
+		include roles::bgp
+	}
+	if has_role('cdimage-search') {
+		include roles::cdimage_search
 	}
 }