Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhifan huang
slapos
Commits
78b23c0d
Commit
78b23c0d
authored
Jan 05, 2021
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/erp5: Fix LD_PRELOAD extension.
parent
263214b9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+10
-3
No files found.
stack/erp5/buildout.hash.cfg
View file @
78b23c0d
...
@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
...
@@ -86,7 +86,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
d942854541f20faa57716b58959e1310
md5sum =
c03f93f95333e6a61b857dcfab7f9c0e
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-zope.cfg.in
View file @
78b23c0d
...
@@ -172,13 +172,20 @@ template = inline: {{ '
...
@@ -172,13 +172,20 @@ template = inline: {{ '
rendered = ${directory:etc}/hosts
rendered = ${directory:etc}/hosts
context = key host_dict hosts-parameter:host-dict
context = key host_dict hosts-parameter:host-dict
[userhosts-bin]
recipe = slapos.recipe.template:jinja2
mode = 755
template = inline:#!{{ parameter_dict['dash'] }}/bin/dash
export HOSTS=${hosts:rendered}
export LD_PRELOAD={{ parameter_dict['userhosts'] }}:$LD_PRELOAD
exec "$@"
rendered = ${directory:bin}/userhosts
[userhosts-wrapper-base]
[userhosts-wrapper-base]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
environment =
environment =
HOSTALIASES=${hostaliases:rendered}
HOSTALIASES=${hostaliases:rendered}
HOSTS=${hosts:rendered}
command-line = '${userhosts-bin:rendered}' ${:wrapped-command-line}
LD_PRELOAD={{ parameter_dict['userhosts'] }}:$LD_PRELOAD
command-line = ${:wrapped-command-line}
{# Hack to deploy SSL certs via instance parameters -#}
{# Hack to deploy SSL certs via instance parameters -#}
{% for zodb in zodb_dict.itervalues() -%}
{% for zodb in zodb_dict.itervalues() -%}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment