Simplify to set zope instance parameter.

313f659c · Tatuya Kamada · 47ee4f2e · 313f659c · 313f659c
Commit 313f659c authored Apr 04, 2017 by Tatuya Kamada
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

stack/erp5/buildout.cfg stack/erp5/buildout.cfg +1 -1

stack/erp5/instance-zope.cfg.in stack/erp5/instance-zope.cfg.in +1 -2

No files found.
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -306,7 +306,7 @@ md5sum = d1cf938074b4b2f407122a40991bfef2
 [template-zope]
 < = download-base
 filename = instance-zope.cfg.in
-md5sum = 21842729ad27757c398bc98cf89f2d3c
+md5sum = e9295963cf22b97819084b7aab056ffd
 link-binary =
  ${aspell:location}/bin/aspell
  ${dmtx-utils:location}/bin/dmtxwrite

--- a/stack/erp5/instance-zope.cfg.in
+++ b/stack/erp5/instance-zope.cfg.in
@@ -46,8 +46,7 @@ ca-crl = ${directory:test-ca-crl}
 recipe = slapos.cookbook:mkdirectory
 bin = ${buildout:directory}/bin
 etc = ${buildout:directory}/etc
-{% set zope_instance_home = slapparameter_dict.get('instance') or '${:srv}/erp5shared' %}
+instance = {{ slapparameter_dict.get('instance') or '${:srv}/erp5shared' }}
-instance =  {{ zope_instance_home }}
 instance-constraint = ${:instance}/Constraint
 instance-document = ${:instance}/Document
 instance-etc = ${:instance}/etc