X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=e535a62b078bb543c7970633a6163f6ba182a40e;hb=4e95e6f4d2918b5c72c106fac3b29789dcb4101f;hp=31c1650c9310a23c3b5a14ad733b1c2aed4f4c30;hpb=500e92545de52baefc1d2bcb98e4207135c292dc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 31c1650c9..e535a62b0 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -64,19 +64,24 @@ class roles {
 		}
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-		include roles::security_mirror
+	if has_role('manpages') {
+		ssl::service { 'manpages.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
 	}
 
 	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
+	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+		include roles::security_mirror
 	}
 
 	if has_role('mirror_debug') {
 		include roles::debug_mirror
 	}
+	if has_role('mirror_ports') {
+		include roles::ports_mirror
+	}
 
 	if has_role('ftp.d.o') {
 		include roles::ftp
@@ -97,6 +102,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -244,24 +250,29 @@ class roles {
 	if has_role('packages') {
 		ssl::service { 'packages.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
 	if has_role('qamaster') {
 		ssl::service { 'qa.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
 	if has_role('packagesqamaster') {
 		ssl::service { 'packages.qa.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org':
 			notify => Service['apache2'],
+			key => true,
+			tlsaport => [443, 6523],
 		}
 	}
 
@@ -286,6 +297,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -335,4 +347,8 @@ class roles {
 			key => true,
 		}
 	}
+
+	if has_role('ports-master') {
+		include roles::ports-master
+	}
 }