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

Revert "Revert "Revert "component/proftpd: use slapos.cookbook:userinfo"""

This reverts commit 22a38bd0.
parent 813411a2
...@@ -4,8 +4,12 @@ extends = ...@@ -4,8 +4,12 @@ extends =
../openssl/buildout.cfg ../openssl/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
[proftpd-userinfo] [proftpd-environment]
recipe = slapos.cookbook:userinfo 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] [proftpd]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -20,8 +24,8 @@ configure-options = ...@@ -20,8 +24,8 @@ configure-options =
environment = environment =
CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include CPPFLAGS=-I${zlib:location}/include -I${openssl:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
install_user=${proftpd-userinfo:pw-name} install_user=${proftpd-environment:USER}
install_group=${proftpd-userinfo:gr-name} install_group=${proftpd-grp:GROUP}
[ftpasswd] [ftpasswd]
......
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