software/erp5: if wendelin-core-zblk-fmt is not given, then use wendelin.core's default.

software/erp5/instance-erp5-input-schema.json

@@ -261,7 +261,7 @@
     },
     "wendelin-core-zblk-fmt": {
       "description": "In wendelin.core there are 2 formats for storing data, so called ZBlk0 and ZBlk1. See https://lab.nexedi.com/nexedi/wendelin.core/blob/2e5e1d3d/bigfile/file_zodb.py#L19 for more details.",
-      "default": "ZBlk1",
+      "default": "",
       "type": "string"
     }
   }

stack/erp5/buildout.hash.cfg

@@ -79,7 +79,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 5f627b3b1e9503d0663cb55f50257aa3
+md5sum = 07f45a5d3a9fd0fe227af82c7ede7631
 
 [template-zeo]
 filename = instance-zeo.cfg.in
@@ -87,7 +87,7 @@ md5sum = 7610bafda245c008ccf0b6ea58ce21c2
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 0668dca80f201b314ac6f8bb257b49f7
+md5sum = b7e92234825f9d72ccb9b6c4745b6ce7
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -146,7 +146,7 @@ config-mysql-url-list = ${request-mariadb:connection-database-list}
 config-site-id = {{ dumps(site_id) }}
 config-smtp-url = ${request-smtp:connection-url}
 config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
-config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', 'ZBlk1')) }}
+config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
 config-zodb-dict = {{ dumps(zodb_dict) }}
 {% for server_type, server_dict in storage_dict.iteritems() -%}
 {%   if server_type == 'neo' -%}

stack/erp5/instance-zope.cfg.in

@@ -201,7 +201,9 @@ environment =
   TZ={{ slapparameter_dict['timezone'] }}
   INSTANCE_HOME=${directory:instance}
   MATPLOTLIBRC={{ parameter_dict['matplotlibrc'] }}
-  WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict.get('wendelin-core-zblk-fmt', 'ZBlk1') }}
+{% if slapparameter_dict.get('wendelin-core-zblk-fmt') %}
+  WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }}
+{% endif %}
 parameters-extra = true
 command-line = '{{ parameter_dict['userhosts'] }}' '{{ bin_directory }}/runzope' -C '${:configuration-file}'