X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=be623c9e91ad1d912f86e56950106162e065a9b5;hb=f65135e3c0a77576ccd49f41f2c879ed60c40e67;hp=84ce24f95eace0042f37a345b7772d19e8015973;hpb=07081329a64e957e0201556bf6f2e0d532f3fce7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 84ce24f95..be623c9e9 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') {
 		include roles::debug_mirror
 	}
-	if has_role('mirror_ports') {
-		include roles::ports_mirror
-	}
 
 	if has_role('ftp.d.o') {
 		include roles::ftp
@@ -102,7 +97,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
-			tlsaport => [],
+			key => true,
 		}
 	}
 
@@ -351,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
+	}
 }