logrotate was overcomplicated

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/vsftpd/files/logrotate.conf b/modules/vsftpd/files/logrotate.conf
new file mode 100644 (file)
index 0000000..2aa6800
--- /dev/null
+++ b/modules/vsftpd/files/logrotate.conf
@@ -0,0 +1,10 @@
+/var/log/ftp/*log
+{
+       create 640 root adm
+
+       # ftpd doesn't handle SIGHUP properly
+       missingok
+       notifempty
+       rotate 4
+       weekly
+}

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 2e099d79af66475a287eabd2e1b7f61d200fd172..531594fc4db09a94e7d10f3ea84d51b09698b528 100644 (file)
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -28,4 +28,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']
+               ]
+       }
+
 }

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index fc941f3b3a8d97d390d6ff0ac9061742a7c4fe5d..077cb43103979bb4330f8c129bb136497eec0620 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -24,8 +24,7 @@ define vsftpd::site (
        }
 
        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

diff --git a/modules/vsftpd/templates/logrotate.erb b/modules/vsftpd/templates/logrotate.erb
deleted file mode 100644 (file)
index 8222237..0000000
--- a/modules/vsftpd/templates/logrotate.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%= scope.lookupvar('logfile') %>
-{
-       create 640 root adm
-
-       # ftpd doesn't handle SIGHUP properly
-       missingok
-       notifempty
-       rotate 4
-       weekly
-}