remove portforwarder files if we do not have a portforwarding user

[mirror/dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 28a443c..55d18f8 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -40,6 +40,8 @@ node default {
        include grub
        include multipath
        include popcon
+       include portforwarder
+
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
        } else {
@@ -104,10 +106,6 @@ node default {
                include hosts
        }
 
-       if $::portforwarder_user_exists {
-               include portforwarder
-       }
-
        if $::samhain {
                include samhain
        }