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 441e20c..1b67879 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,17 +71,12 @@ 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
        }
-       if has_role('mirror_ports') {
-               include roles::ports_mirror
-       }
 
        if has_role('ftp.d.o') {
                include roles::ftp
@@ -351,6 +346,9 @@ class roles {
        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':
@@ -359,4 +357,7 @@ class roles {
                        target_port => 81,
                }
        }
+       if has_role('onionbalance') {
+               include roles::onionbalance
+       }
 }