From 2e543336735a47031e835f32ee49351ad84eea45 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 20 May 2012 08:37:02 +0100 Subject: [PATCH] some more vsftp log stuff Signed-off-by: Stephen Gran --- modules/vsftpd/manifests/site.pp | 2 ++ modules/vsftpd/templates/vsftpd.conf.erb | 1 + 2 files changed, 3 insertions(+) diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp index 077cb431..46c805ed 100644 --- a/modules/vsftpd/manifests/site.pp +++ b/modules/vsftpd/manifests/site.pp @@ -16,6 +16,8 @@ define vsftpd::site ( default: { fail ( "Invald ensure `$ensure' for $name" ) } } + $ftpsite = $name + $fname = "/etc/vsftpd-${name}.conf" file { $fname: diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb index d3f708bf..471b8f5c 100644 --- a/modules/vsftpd/templates/vsftpd.conf.erb +++ b/modules/vsftpd/templates/vsftpd.conf.erb @@ -10,6 +10,7 @@ chown_username=<%= scope.lookupvar('chown_user') %> xferlog_enable=YES xferlog_file=<%= scope.lookupvar('logfile') %> +vsftpd_log_file=/var/log/ftp/<%= scope.lookupvar('ftpsite') %> ftpd_banner=<%= scope.lookupvar('banner') %> secure_chroot_dir=/var/run/vsftpd -- 2.39.2