X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a6d6647762829208fae147ab99db13a33e65fda9;hb=372685900fc51ce956bddc100bc534327946bb10;hp=3e2b57523aec71e978747a78a720c52f15484978;hpb=743685b250a85a9fbc9f30147c30e98168c945ee;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3e2b57523..a6d664776 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -64,19 +64,22 @@ 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 has_role('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 +100,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -251,18 +255,22 @@ 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,
 		}
 	}
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org':
 			notify => Service['apache2'],
+			key => true,
+			tlsaport => [443, 6523],
 		}
 	}
 
@@ -287,6 +295,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -336,4 +345,19 @@ class roles {
 			key => true,
 		}
 	}
+
+	if has_role('ports-master') {
+		include roles::ports-master
+	}
+
+	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 roles::onionbalance
+	}
 }