Do not mask vsftpd.service in each site

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 338a59274b44706f9a65915dd0f89af2bb9e5529..f8a71a0fb52d9aa297949593bf0df5af0efb635a 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -9,13 +9,15 @@ define vsftpd::site (
        $ensure=present
 ){
 
-       include vsftpd::nolisten
+       include vsftpd
 
        case $ensure {
                present,absent: {}
                default: { fail ( "Invald ensure `$ensure' for $name" ) }
        }
 
+       $ftpsite = $name
+
        $fname = "/etc/vsftpd-${name}.conf"
 
        file { $fname:
@@ -24,8 +26,14 @@ define vsftpd::site (
        }
 
        file { "/etc/logrotate.d/vsftpd-${name}":
-               ensure  => $ensure,
-               content => template('vsftpd/logrotate.erb')
+               ensure => absent
+       }
+
+       munin::check { "vsftpd-${name}":
+               script => 'vsftpd'
+       }
+       munin::conf { "vsftpd-${name}":
+               content => template('vsftpd/munin.erb')
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
@@ -40,4 +48,5 @@ define vsftpd::site (
                require     => File[$fname]
        }
 
+       Service['vsftpd']->Service['xinetd']
 }