From: Stephen Gran <steve@lobefin.net>
Date: Sun, 20 May 2012 07:24:14 +0000 (+0100)
Subject: logrotate was overcomplicated
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=a691c72453f8511a9711e63059aa2991ad0459d6

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
index 00000000..2aa68004
--- /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 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
diff --git a/modules/vsftpd/templates/logrotate.erb b/modules/vsftpd/templates/logrotate.erb
deleted file mode 100644
index 82222378..00000000
--- 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
-}