wiki -> hiera role; explicitly include apache2

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4e4a9a2..0abfd9b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,14 +45,6 @@ class roles {
                include roles::security_mirror
        }
 
-       if has_role('git_master') {
-               include roles::git_master
-       }
-
-       if has_role('wiki') {
-               include roles::wiki
-       }
-
        if has_role('syncproxy') {
                include roles::syncproxy
        }