and onionbalance module

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index db9db67..5efac97 100644 (file)
--- 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': }
+       }
 }