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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1d7282435..ead009c09 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,16 +60,23 @@ 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') {
 		include roles::security_mirror
 	}
+	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
 	}
@@ -204,10 +213,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
-
 	if has_role('rtc') {
 		include roles::rtc
 	}
@@ -268,6 +273,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
@@ -298,8 +306,8 @@ class roles {
 		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_master') {
+		include roles::ports_master
 	}
 	if has_role('ports_mirror') {
 		include roles::ports_mirror
@@ -311,4 +319,10 @@ class roles {
 	if has_role('onionbalance') {
 		include onion::balance
 	}
+	if has_role('bgp') {
+		include roles::bgp
+	}
+	if has_role('cdimage-search') {
+		include roles::cdimage_search
+	}
 }