er, this is what I meant

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

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 451706e193f189e347b5c9c615438892aacf9945..7f0be8fc83455f9557916d254c3c18bb47959cd5 100644 (file)
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -8,11 +8,19 @@ class vsftpd {
        }
 
        service { 'vsftpd':
-               ensure  => running,
+               ensure  => stopped,
                require => Package['vsftpd']
        }
 
-       munin::check { 'vsftpd': }
+       file { '/etc/vsftpd.conf':
+               content => "listen=NO\n",
+               require => Package['vsftpd'],
+               notify  => Service['vsftpd']
+       }
+
+       munin::check { 'vsftpd':
+               ensure => absent
+       }
        munin::check { 'ps_vsftpd':
                script => 'ps_'
        }
@@ -22,4 +30,17 @@ class vsftpd {
                description => 'Allow ftp access',
                rule        => '&SERVICE(tcp, 21)',
        }
+
+       file { '/var/log/ftp':
+               ensure => directory,
+               mode   => '0755'
+       }
+       file { '/etc/logrotate.d/vsftpd':
+               source  => 'puppet:///modules/vsftpd/logrotate.conf',
+               require => [
+                       Package['vsftpd'],
+                       Package['debian.org']
+               ]
+       }
+
 }