From: Stephen Gran Date: Sat, 28 Apr 2012 15:09:26 +0000 (+0100) Subject: and another X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a65c5c5e2de93b525d3b21b7fb0930634c75c7d9;p=dsa-puppet.git and another Signed-off-by: Stephen Gran --- diff --git a/modules/roles/templates/security_mirror/.vsftpd.conf.swp b/modules/roles/templates/security_mirror/.vsftpd.conf.swp deleted file mode 100644 index bf1c1d3c..00000000 Binary files a/modules/roles/templates/security_mirror/.vsftpd.conf.swp and /dev/null differ diff --git a/modules/roles/templates/security_mirror/vsftpd.conf b/modules/roles/templates/security_mirror/vsftpd.conf index e68fe195..f75a9660 100644 --- a/modules/roles/templates/security_mirror/vsftpd.conf +++ b/modules/roles/templates/security_mirror/vsftpd.conf @@ -8,5 +8,6 @@ setproctitle_enable=YES dirmessage_enable=NO connect_from_port_20=NO xferlog_file=/var/log/ftp/vsftpd-security.debian.org.log +xferlog_file=<%= scope.lookupvar('logfile') %> ls_recurse_enable=YES ftpd_banner=security.debian.org FTP server (vsftpd)