Commit 0f81fd88 authored by Julien Muchembled's avatar Julien Muchembled

Stop using collective.recipe.environment & collective.recipe.grp

parent ef0055d2
# http://www.proftpd.org/ - Highly configurable GPL-licensed FTP server software # http://www.proftpd.org/ - Highly configurable GPL-licensed FTP server software
#
# Because it uses collective.recipe.environment this components needs slapos.core >= 1.4.7
# ( grid: do not hide `$USER` when running buildout )
#
[buildout] [buildout]
extends = extends =
../openssl/buildout.cfg ../openssl/buildout.cfg
...@@ -15,11 +12,12 @@ extends = ...@@ -15,11 +12,12 @@ extends =
../zstd/buildout.cfg ../zstd/buildout.cfg
# proftpd server # proftpd server
[proftpd-environment] [proftpd-info]
recipe = collective.recipe.environment recipe = slapos.recipe.build
init =
[proftpd-grp] import grp, os, pwd
recipe = collective.recipe.grp options['USER'] = pwd.getpwuid(os.getuid())[0]
options['GROUP'] = grp.getgrgid(os.getgid())[0]
[proftpd] [proftpd]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -36,8 +34,8 @@ environment = ...@@ -36,8 +34,8 @@ environment =
CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\" CFLAGS=-DPR_RUN_DIR=\"/proc/self/cwd/var\"
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-environment:USER} install_user=${proftpd-info:USER}
install_group=${proftpd-grp:GROUP} install_group=${proftpd-info:GROUP}
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patch-options = -p1 patch-options = -p1
patches = patches =
......
...@@ -171,8 +171,6 @@ mode = 640 ...@@ -171,8 +171,6 @@ mode = 640
[versions] [versions]
websockify = 0.9.0 websockify = 0.9.0
collective.recipe.environment = 0.2.0
gitdb = 0.6.4 gitdb = 0.6.4
pycurl = 7.43.0 pycurl = 7.43.0
smmap = 0.9.0 smmap = 0.9.0
...@@ -44,6 +44,4 @@ context = ...@@ -44,6 +44,4 @@ context =
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
[versions] [versions]
collective.recipe.environment = 1.1.0
collective.recipe.grp = 1.1.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
...@@ -175,5 +175,4 @@ gitdb = 0.6.4 ...@@ -175,5 +175,4 @@ gitdb = 0.6.4
gunicorn = 19.10.0 gunicorn = 19.10.0
prettytable = 0.7.2 prettytable = 0.7.2
pycurl = 7.43.0 pycurl = 7.43.0
collective.recipe.environment = 0.2.0
smmap = 0.9.0 smmap = 0.9.0
...@@ -26,7 +26,6 @@ parts = ...@@ -26,7 +26,6 @@ parts =
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = eggs =
collective.recipe.template collective.recipe.template
collective.recipe.environment
#---------------- #----------------
#-- #--
......
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