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 c671af5..55d18f8 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,10 +21,10 @@ Service {
 node default {
        include site
        include munin
-       include syslog-ng
+       include syslog_ng
        include sudo
        include ssh
-       include debian-org
+       include debian_org
        include monit
        include time
        include ssl
@@ -40,6 +40,8 @@ node default {
        include grub
        include multipath
        include popcon
+       include portforwarder
+
        if $::lsbdistcodename == squeeze {
                include roles::udldap::client
        } else {
@@ -69,7 +71,7 @@ node default {
                include bacula::storage
        }
 
-       if $::kernel == Linux {
+       if $::kernel == 'Linux' {
                include linux
                include acpi
        } elsif $::kernel == 'GNU/kFreeBSD' {
@@ -96,7 +98,7 @@ node default {
                include named::geodns
        }
 
-       if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
+       if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] {
                include nfs-server
        }
 
@@ -104,16 +106,12 @@ node default {
                include hosts
        }
 
-       if $::portforwarder_user_exists {
-               include portforwarder
-       }
-
        if $::samhain {
                include samhain
        }
 
        if $::hostname in [geo3,wieck] {
-               include debian-org::radvd
+               include debian_org::radvd
        }
 
        if ($::postgres) {
@@ -124,12 +122,6 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hoster {
-               if $::hoster in [ynic] {
-                       include lldp
-               }
-       }
-
        if $::hostname == 'pkgmirror-csail' {
                include varnish
        }