X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Ftemplates%2Fvsftpd.conf.erb;h=5a09a5dd76307e0b35f331026a219b56087fda6f;hb=b911ee781933764f5ee1282286432e3a759ea8ac;hp=471b8f5c60064cc9e66942234bdc0306c62c6a7b;hpb=2e543336735a47031e835f32ee49351ad84eea45;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb
index 471b8f5c6..5a09a5dd7 100644
--- a/modules/vsftpd/templates/vsftpd.conf.erb
+++ b/modules/vsftpd/templates/vsftpd.conf.erb
@@ -1,16 +1,25 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 anonymous_enable=YES
 anon_root=<%= scope.lookupvar('root') %>
 <%- if scope.lookupvar('writable') -%>
 anon_umask=027
 write_enable=YES
 anon_upload_enable=YES
-chown_uploads=YES
+chown_uploads=NO
 chown_username=<%= scope.lookupvar('chown_user') %>
 <%- end -%>
+<%- if scope.lookupvar('writable') and scope.lookupvar('writable_other') -%>
+anon_other_write_enable=YES
+delete_failed_uploads=YES
+<%- end -%>
 
 xferlog_enable=YES
 xferlog_file=<%= scope.lookupvar('logfile') %>
-vsftpd_log_file=/var/log/ftp/<%= scope.lookupvar('ftpsite') %>
+vsftpd_log_file=/var/log/ftp/<%= scope.lookupvar('ftpsite') %>.log
 
 ftpd_banner=<%= scope.lookupvar('banner') %>
 secure_chroot_dir=/var/run/vsftpd
@@ -20,4 +29,4 @@ dirmessage_enable=NO
 ls_recurse_enable=NO
 connect_from_port_20=NO
 max_clients=<%= scope.lookupvar('max_clients') %>
-
+listen=NO