exim blacklist: add more recent spammers

[mirror/dsa-puppet.git] / modules / vsftpd / templates / vsftpd.conf.erb

diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb
index 9229acb..739efa3 100644 (file)
--- 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') %>