mirror_debug -> debug_mirror

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7c9aa85..1b67879 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,12 +71,10 @@ 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') {
+       if has_role('debug_mirror') {
                include roles::debug_mirror
        }
 
@@ -99,6 +97,7 @@ class roles {
        if has_role('people') {
                ssl::service { 'people.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -253,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],
                }
        }
 
@@ -289,6 +292,7 @@ class roles {
        if has_role('veyepar.debian.org') {
                ssl::service { 'veyepar.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -338,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
+       }
 }