X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=40e6e3942765aace3189723be4fe351340959132;hb=2b73b23a1a6400494949bf864a1b59450c9e72e7;hp=b1bdc4d6670667a023f9985549f30e39c0775519;hpb=4c99b2af37a0c04d398b40ff9c5978476aced68b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b1bdc4d66..40e6e3942 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,
 		}
 	}
 
@@ -256,6 +252,7 @@ class roles {
 	if has_role('qamaster') {
 		ssl::service { 'qa.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -295,6 +292,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -348,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 onion::balance
+	}
 }