Commit fac9db40 authored by Julien Muchembled's avatar Julien Muchembled

zope: simplify forwarding of template parameter for binary symlinks

parent 14c55a72
...@@ -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 = d686512d2dbb2ec5e3b2526e86d250e5 md5sum = d9d49e84a527bf1ec8f856bc7bcb7b09
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
......
...@@ -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}
......
...@@ -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
......
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