X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=5efac975e1a016062f8ba51b6005f17a24ecfc7b;hb=8d9666e63a8876fa5e85964fe5c1de8d849a9fe3;hp=db9db67a708db861a36d57d899d8df76e4c8f20b;hpb=2dde8b9bbeffec9e933759223e65239075c4b8ad;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index db9db67a7..5efac975e 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -102,6 +102,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -256,13 +257,14 @@ 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'],
-			tlsaport => [],
+			key => true,
 		}
 	}
 
@@ -295,6 +297,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -348,4 +351,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 $::hostname in [olin] {
+		onion::balance_service { 'ftp.debian.org': }
+	}
 }