fixup! stack/erp5: enable server-sync for ZEO

software/erp5/test/test/test_erp5.py

@@ -364,16 +364,18 @@ class TestZopeNodeParameterOverride(ERP5InstanceTestCase, TestPublishedURLIsReac
       zodb["mount-point"] = "/"
       zodb["pool-size"] = 4
       zodb["pool-timeout"] = "10m"
+      zodb["%import"] = "ZEO"
       storage["storage"] = "root"
       storage["server"] = zeo_addr
+      storage["server-sync"] = "true"
       with open('%s/etc/zope-%s.conf' % (partition, zope)) as f:
         conf = list(map(str.strip, f.readlines()))
       i = conf.index("<zodb_db root>") + 1
       conf = iter(conf[i:conf.index("</zodb_db>", i)])
       for line in conf:
-        if line == '<zeoclient>':
+        if line == '<clientstorage>':
           for line in conf:
-            if line == '</zeoclient>':
+            if line == '</clientstorage>':
               break
             checkParameter(line, storage)
           for k, v in six.iteritems(storage):

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = 45cc45510b59ceb730b6e38448b5c0c3
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = b524c9ef4d7deadfd4bd84f2e880f9ed
+md5sum = 7c82d4c49e01a72a173f2bc66f1524d6
 
 [site-zcml]
 filename = site.zcml

stack/erp5/zope.conf.in

@@ -132,9 +132,9 @@ trusted-proxy 0.0.0.0
 {% set type_dict = {'neo': 'NEOStorage', 'zeo': 'clientstorage'} %}
 {% for name, zodb_dict in six.iteritems(parameter_dict['zodb-dict']) %}
 <zodb_db {{ name }}>
-{% if zodb_dict['type'] == 'zeo' %}
+{%- if zodb_dict['type'] == 'zeo' %}
   %import ZEO
-{% endif %}
+{%- endif %}
 {%- set storage_type = type_dict[zodb_dict.pop('type')] %}
 {%- set storage_dict = zodb_dict.pop('storage-dict') %}
 {%- do root_common.apply_overrides(zodb_dict, node_id) %}