X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Ftemplates%2Fvsftpd.conf.erb;h=739efa3cb5b5cf244ad6b4be05165b5fcaf3b527;hb=6f656bd4265e3dab13b9af2bf96e9044322e9d8f;hp=bb1d3dd64df51d790eaf99c3044e28b7814eddc7;hpb=536b02369dc8743a6c3611cff42f174612ed8a12;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb
index bb1d3dd64..739efa3cb 100644
--- a/modules/vsftpd/templates/vsftpd.conf.erb
+++ b/modules/vsftpd/templates/vsftpd.conf.erb
@@ -9,9 +9,19 @@ anon_root=<%= scope.lookupvar('root') %>
 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 -%>
+<%- if not scope.lookupvar('readable') -%>
+download_enable=NO
+<%- end -%>
+<%- if not scope.lookupvar('listable') -%>
+dirlist_enable=NO
+<%- end -%>
 
 xferlog_enable=YES
 xferlog_file=<%= scope.lookupvar('logfile') %>
@@ -25,4 +35,4 @@ dirmessage_enable=NO
 ls_recurse_enable=NO
 connect_from_port_20=NO
 max_clients=<%= scope.lookupvar('max_clients') %>
-
+listen=NO