From a691c72453f8511a9711e63059aa2991ad0459d6 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 20 May 2012 08:24:14 +0100 Subject: [PATCH] logrotate was overcomplicated Signed-off-by: Stephen Gran --- .../logrotate.erb => files/logrotate.conf} | 2 +- modules/vsftpd/manifests/init.pp | 13 +++++++++++++ modules/vsftpd/manifests/site.pp | 3 +-- 3 files changed, 15 insertions(+), 3 deletions(-) rename modules/vsftpd/{templates/logrotate.erb => files/logrotate.conf} (75%) diff --git a/modules/vsftpd/templates/logrotate.erb b/modules/vsftpd/files/logrotate.conf similarity index 75% rename from modules/vsftpd/templates/logrotate.erb rename to modules/vsftpd/files/logrotate.conf index 82222378..2aa68004 100644 --- a/modules/vsftpd/templates/logrotate.erb +++ b/modules/vsftpd/files/logrotate.conf @@ -1,4 +1,4 @@ -<%= scope.lookupvar('logfile') %> +/var/log/ftp/*log { create 640 root adm diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp index 2e099d79..531594fc 100644 --- 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 fc941f3b..077cb431 100644 --- 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 -- 2.39.2