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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b92bbceca..a6d664776 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,11 +71,9 @@ 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
 	}
@@ -102,6 +100,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -350,4 +349,15 @@ class roles {
 	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
+	}
 }