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

diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb
index f86c89e96..739efa3cb 100644
--- a/modules/vsftpd/templates/vsftpd.conf.erb
+++ b/modules/vsftpd/templates/vsftpd.conf.erb
@@ -1,12 +1,27 @@
+##
+## 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 -%>
+<%- 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') %>
@@ -20,4 +35,4 @@ dirmessage_enable=NO
 ls_recurse_enable=NO
 connect_from_port_20=NO
 max_clients=<%= scope.lookupvar('max_clients') %>
-
+listen=NO