X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=ead009c093b748f03c33d3adab43559269d39d69;hb=836eff39ec561176cd00cc2d7b4e66e9668a25ee;hp=d2527978ecc1c0ea152248a8fa9eccc4f33ff90f;hpb=96cd3ed6d32efe39605dd9b661fa759c4600f6bf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d2527978e..ead009c09 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,7 +45,7 @@ class roles {
 	if has_role('bugs_base') {
 		ssl::service { 'bugs.debian.org':
 			notify  => Exec['service apache2 reload'],
-			tlsaport => [],
+			key => true,
 		}
 	}
 	if has_role('bugs_master') {
@@ -64,13 +64,19 @@ class roles {
 		}
 	}
 
-	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
 	}
@@ -300,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
@@ -313,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
+	}
 }