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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 168b6f294..be623c9e9 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -67,14 +67,13 @@ class roles {
 	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_security_mirror') {
+	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
-
 	if has_role('mirror_debug') {
 		include roles::debug_mirror
 	}
@@ -98,6 +97,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -252,18 +252,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],
 		}
 	}
 
@@ -288,6 +292,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -337,4 +342,22 @@ class roles {
 			key => true,
 		}
 	}
+
+	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
+	}
 }