X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Finit.pp;h=7f0be8fc83455f9557916d254c3c18bb47959cd5;hb=7a0b5ea7181cc3ddfc465423a7e51f04ee4c2a97;hp=451706e193f189e347b5c9c615438892aacf9945;hpb=96d02de0e841b2a067dba244d62562cd46d4035b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 451706e19..7f0be8fc8 100644
--- 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']
+		]
+	}
+
 }