logrotate was overcomplicated

[dsa-puppet.git] / modules / vsftpd / manifests / site.pp

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index f65387588631ee3ed2e2d92c34a7cd17e3f2631b..077cb43103979bb4330f8c129bb136497eec0620 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -9,7 +9,7 @@ define vsftpd::site (
        $ensure=present
 ){
 
-       include vsftpd::nolisten
+       include vsftpd
 
        case $ensure {
                present,absent: {}
@@ -20,13 +20,11 @@ define vsftpd::site (
 
        file { $fname:
                ensure  => $ensure,
-               noop    => true,
                content => template('vsftpd/vsftpd.conf.erb')
        }
 
        file { "/etc/logrotate.d/vsftpd-${name}":
-               ensure  => $ensure,
-               content => template('vsftpd/logrotate.erb')
+               ensure => absent
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
@@ -41,4 +39,5 @@ define vsftpd::site (
                require     => File[$fname]
        }
 
+       Service['vsftpd']->Service['xinetd']
 }