popcon -> 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 583ad92..98fb71e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -96,8 +96,4 @@ class roles {
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }
-
-       if has_role('popcon') {
-               include roles::popcon
-       }
 }