onion for security

[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..a6d6647 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,11 +71,9 @@ 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') {
                include roles::debug_mirror
        }
@@ -359,4 +357,7 @@ class roles {
                        target_port => 81,
                }
        }
+       if has_role('onionbalance') {
+               include roles::onionbalance
+       }
 }