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 168b6f2..5efac97 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -67,6 +67,7 @@ class roles {
        if has_role('manpages') {
                ssl::service { 'manpages.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -78,6 +79,9 @@ class roles {
        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
@@ -98,6 +102,7 @@ class roles {
        if has_role('people') {
                ssl::service { 'people.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -252,18 +257,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 +297,7 @@ class roles {
        if has_role('veyepar.debian.org') {
                ssl::service { 'veyepar.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -337,4 +347,19 @@ class roles {
                        key => true,
                }
        }
+
+       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': }
+       }
 }