Commit f23a4c24 authored by Jérome Perrin's avatar Jérome Perrin

proftpd: use slapos.cookbook:userinfo which provides more details

parent d1452403
......@@ -16,7 +16,7 @@
[instance-profile]
filename = instance.cfg.in
md5sum = c5e0ab81a715391d3774093f402935cf
md5sum = c3e21ca5422b5761ecfccbe9a068f767
[proftpd-config-file]
filename = proftpd-config-file.cfg.in
......
......@@ -48,13 +48,8 @@ extensions = jinja2.ext.do
recipe = slapos.cookbook:check_port_listening
path = ${directory:promise}/${:_buildout_section_name_}
[proftpd-environment]
recipe = collective.recipe.environment
# This component depends on https://nexedi.erp5.net/bug_module/20180402-716ACB/ being fixed
[proftpd-grp]
recipe = collective.recipe.grp
[proftpd-userinfo]
recipe = slapos.cookbook:userinfo
[proftpd-password]
recipe = slapos.cookbook:generate.password
......@@ -68,8 +63,8 @@ host = ${:ipv6}
sftp-port = 8022
url = sftp://[${:host}]:${:sftp-port}
data-dir = ${directory:proftpd-dir}
user=${proftpd-environment:USER}
group=${proftpd-grp:GROUP}
user=${proftpd-userinfo:pw-name}
group=${proftpd-userinfo:gr-name}
sftp-log=${directory:log}/proftpd-sftp.log
xfer-log=${directory:log}/proftpd-xfer.log
ban-log=${directory:log}/proftpd-ban.log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment