X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Ftemplates%2Fvsftpd.conf.erb;h=9229acb5897f0f6f6bad1a586cd2139fa39aa839;hb=b4d190a6bafefb28f5a8359dcb7c7992515d8de6;hp=d3f708bf62bd7b26c1f00a70f2c41961f3557358;hpb=6ca6f6af1264badd3565ccae3dc4d8dbcfd1bf0a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb
index d3f708bf6..9229acb58 100644
--- a/modules/vsftpd/templates/vsftpd.conf.erb
+++ b/modules/vsftpd/templates/vsftpd.conf.erb
@@ -1,3 +1,8 @@
+##
+## 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') -%>
@@ -10,6 +15,7 @@ chown_username=<%= scope.lookupvar('chown_user') %>
 
 xferlog_enable=YES
 xferlog_file=<%= scope.lookupvar('logfile') %>
+vsftpd_log_file=/var/log/ftp/<%= scope.lookupvar('ftpsite') %>.log
 
 ftpd_banner=<%= scope.lookupvar('banner') %>
 secure_chroot_dir=/var/run/vsftpd
@@ -19,4 +25,4 @@ dirmessage_enable=NO
 ls_recurse_enable=NO
 connect_from_port_20=NO
 max_clients=<%= scope.lookupvar('max_clients') %>
-
+listen=NO