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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos
Commits
fac9db40
Commit
fac9db40
authored
Jul 17, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zope: simplify forwarding of template parameter for binary symlinks
parent
14c55a72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
9 deletions
+4
-9
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+1
-4
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+1
-3
No files found.
stack/erp5/buildout.cfg
View file @
fac9db40
...
@@ -203,7 +203,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
...
@@ -203,7 +203,7 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum = d
686512d2dbb2ec5e3b2526e86d250e5
md5sum = d
9d49e84a527bf1ec8f856bc7bcb7b09
extra-context =
extra-context =
key zope_binary_links template-zope:binary-links
key zope_binary_links template-zope:binary-links
key apache_location apache:location
key apache_location apache:location
...
@@ -278,7 +278,7 @@ md5sum = 8453652206eac7b165c86cf236b87cbf
...
@@ -278,7 +278,7 @@ md5sum = 8453652206eac7b165c86cf236b87cbf
[template-zope]
[template-zope]
< = download-base
< = download-base
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
a2a2d830124c839aefc6739353cb3f66
md5sum =
d8ac9f7ac15359e64763e3b3891655a9
binary-links =
binary-links =
${coreutils:location}/bin/basename
${coreutils:location}/bin/basename
${coreutils:location}/bin/cat
${coreutils:location}/bin/cat
...
...
stack/erp5/instance-zope.cfg.in
View file @
fac9db40
...
@@ -74,10 +74,7 @@ ca-crl = ${:test-ca-dir}/crl
...
@@ -74,10 +74,7 @@ ca-crl = ${:test-ca-dir}/crl
[binary-link]
[binary-link]
recipe = slapos.cookbook:symbolic.link
recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:bin}
target-directory = ${directory:bin}
link-binary =
link-binary = {{ dumps(parameter_dict['binary-links']) }}
{%- for bin in parameter_dict['binary-links'].splitlines() %}
{{ bin }}
{%- endfor %}
[certificate-authority-common]
[certificate-authority-common]
requests-directory = ${directory:requests}
requests-directory = ${directory:requests}
...
...
stack/erp5/instance.cfg.in
View file @
fac9db40
...
@@ -132,9 +132,7 @@ buildout-bin-directory = {{ buildout_bin_directory }}
...
@@ -132,9 +132,7 @@ buildout-bin-directory = {{ buildout_bin_directory }}
6tunnel = {{ sixtunnel_location }}
6tunnel = {{ sixtunnel_location }}
dash = {{ dash_location }}
dash = {{ dash_location }}
jsl = {{ jsl_location }}
jsl = {{ jsl_location }}
binary-links =
binary-links = {{ dumps(zope_binary_links) }}
{%- for path in zope_binary_links.splitlines() %} {{ path }}
{% endfor %}
[dynamic-template-zope]
[dynamic-template-zope]
< = jinja2-template-base
< = jinja2-template-base
...
...
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