From ef85fd15f903fb29c07253ceaf31564ab6893eb0 Mon Sep 17 00:00:00 2001 From: peppos Date: Wed, 24 Jan 2018 14:38:32 +0100 Subject: [PATCH] add chroot_list_enable and chroot_list_file class --- manifests/init.pp | 2 ++ templates/configfile.erb | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4b33e93..8c3e1e2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,6 +28,8 @@ $connect_from_port_20 = undef, $xferlog_std_format = undef, $chroot_local_user = undef, + $chroot_list_file = undef, + $chroot_list_enable = undef, $listen = undef, $listen_ipv6 = undef, $pam_service_name = undef, diff --git a/templates/configfile.erb b/templates/configfile.erb index 98840a9..afe4106 100644 --- a/templates/configfile.erb +++ b/templates/configfile.erb @@ -116,9 +116,12 @@ xferlog_std_format=<%= @xferlog_std_format %> <% if @chroot_local_user -%> chroot_local_user=<%= @chroot_local_user %> <% end -%> -#chroot_list_enable=YES -# (default follows) -#chroot_list_file=/etc/vsftpd/chroot_list +<% if @chroot_list_enable -%> +chroot_list_enable=<%= @chroot_list_enable %> +<% end -%> +<% if @chroot_list_file -%> +chroot_list_file=<%= @chroot_list_file %> +<% end -%> # # You may activate the "-R" option to the builtin ls. This is disabled by # default to avoid remote users being able to cause excessive I/O on large