X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Fmanifests%2Finit.pp;h=7f0be8fc83455f9557916d254c3c18bb47959cd5;hb=8d059d6d72884c217b16f16987e4aa2804f88c3c;hp=9ca68bfdd3eb76fe2b0da0262c44b15dd03c2466;hpb=47b37f6a9bbb69e5d90ea7e44237618c14b90608;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
index 9ca68bfdd..7f0be8fc8 100644
--- a/modules/vsftpd/manifests/init.pp
+++ b/modules/vsftpd/manifests/init.pp
@@ -8,10 +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_'
 	}
@@ -21,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']
+		]
+	}
+
 }