X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fvsftpd%2Ftemplates%2Fvsftpd.conf.erb;h=bb1d3dd64df51d790eaf99c3044e28b7814eddc7;hb=497204357b7446d48245ed298c975bf6e94082bc;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..bb1d3dd64 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,7 +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') %>
+vsftpd_log_file=/var/log/ftp/<%= scope.lookupvar('ftpsite') %>.log
 
 ftpd_banner=<%= scope.lookupvar('banner') %>
 secure_chroot_dir=/var/run/vsftpd