X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=676fdef3f92cacfb3720927e36f544700115bf21;hb=0197bda3eea9ddc92775251f6ab75ae86f1923fc;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..676fdef3f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -79,6 +79,9 @@ class roles {
 	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
@@ -253,12 +256,14 @@ class roles {
 	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,
 		}
 	}
 
@@ -266,6 +271,7 @@ class roles {
 		ssl::service { 'gobby.debian.org':
 			notify => Service['apache2'],
 			key => true,
+			tlsaport => [443, 6523],
 		}
 	}
 
@@ -339,4 +345,8 @@ class roles {
 			key => true,
 		}
 	}
+
+	if has_role('ports-master') {
+		include roles::ports-master
+	}
 }