X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=1b67879b6ddfc2cd5d0f89bcf1d51a139b3f50f2;hb=a12917959f1de3525ee686542406f12f3ff06e0c;hp=676fdef3f92cacfb3720927e36f544700115bf21;hpb=f0592778e175dd64df69a349a716fe8ca89ad66f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 676fdef3f..1b67879b6 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,17 +71,12 @@ class roles {
 		}
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
-
-	if has_role('mirror_debug') {
+	if has_role('debug_mirror') {
 		include roles::debug_mirror
 	}
-	if has_role('mirror_ports') {
-		include roles::ports_mirror
-	}
 
 	if has_role('ftp.d.o') {
 		include roles::ftp
@@ -102,6 +97,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -296,6 +292,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -349,4 +346,18 @@ class roles {
 	if has_role('ports-master') {
 		include roles::ports-master
 	}
+	if has_role('ports_mirror') {
+		include roles::ports_mirror
+	}
+
+	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
+	}
 }