diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index 5cf884ec46920779439f9c0cae6f5f2fcf87e48a..3a82e113cfd3e286e8b2dd056f7c8784b93913d7 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -203,9 +203,9 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 # XXX: "template.cfg" is hardcoded in instanciation recipe filename = template.cfg template = ${:_profile_base_location_}/instance.cfg.in -md5sum = d9d49e84a527bf1ec8f856bc7bcb7b09 +md5sum = d721cf9bb9a29736dbd37f131929ccab extra-context = - key zope_binary_links template-zope:binary-links + key zope_link_binary template-zope:link-binary key apache_location apache:location key aspell_location aspell:location key buildout_bin_directory buildout:bin-directory @@ -278,8 +278,8 @@ md5sum = 8453652206eac7b165c86cf236b87cbf [template-zope] < = download-base filename = instance-zope.cfg.in -md5sum = d8ac9f7ac15359e64763e3b3891655a9 -binary-links = +md5sum = 0469c25e4a5fdaa9e0ab12feeb8d214d +link-binary = ${coreutils:location}/bin/basename ${coreutils:location}/bin/cat ${coreutils:location}/bin/cp diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in index e5f5e5b6c31d65fe8df719ae10ce8ec940981c25..00d9bf17c28bdf6b879c75d3b454cbb9b0ceabdb 100644 --- a/stack/erp5/instance-zope.cfg.in +++ b/stack/erp5/instance-zope.cfg.in @@ -74,7 +74,7 @@ ca-crl = ${:test-ca-dir}/crl [binary-link] recipe = slapos.cookbook:symbolic.link target-directory = ${directory:bin} -link-binary = {{ dumps(parameter_dict['binary-links']) }} +link-binary = {{ dumps(parameter_dict['link-binary']) }} [certificate-authority-common] requests-directory = ${directory:requests} diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in index 495076f72c03096b4272117fef21924444a2eae2..84ca4e536efa7a5212aa04c0ebe8f54599a2ff89 100644 --- a/stack/erp5/instance.cfg.in +++ b/stack/erp5/instance.cfg.in @@ -132,7 +132,7 @@ buildout-bin-directory = {{ buildout_bin_directory }} 6tunnel = {{ sixtunnel_location }} dash = {{ dash_location }} jsl = {{ jsl_location }} -binary-links = {{ dumps(zope_binary_links) }} +link-binary = {{ dumps(zope_link_binary) }} [dynamic-template-zope] < = jinja2-template-base