stack/erp5: Move webdav option to family-override.

use this new mechanism, which avoids this parameter being misused
(inconsistent between partitions of the same family).
Preserve backward compatibility, giving precedence to the new mechanism.

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

@@ -98,6 +98,11 @@
         ".*": {
           "default": {},
           "properties": {
+            "webdav": {
+              "description": "Serve webdav queries, implies timerserver-interval=0 (disabled)",
+              "default": false,
+              "type": "boolean"
+            },
             "activity-deadline": {
               "description": "Override global activity deadline",
               "type": ["number", "null"]
@@ -207,11 +212,6 @@
               "type": "boolean",
               "default": false
             },
-            "webdav": {
-              "description": "Serve webdav queries, implies timerserver-interval=0 (disabled). Mixing webdav and non-webdav nodes in a single family will give unspecified results.",
-              "default": false,
-              "type": "boolean"
-            },
             "longrequest-logger-interval": {
               "description": "Period, in seconds, with which LongRequestLogger polls worker thread stack traces, or -1 to disable",
               "default": -1,

stack/erp5/buildout.hash.cfg

@@ -74,7 +74,7 @@ md5sum = b5ac16fdeed8863e465e955ba6d1e12a
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 1d380028856c488f5ed87ca2b78ba79a
+md5sum = a608ff4dfd0600826cadba6aa3881b48
 
 [template-zeo]
 filename = instance-zeo.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -263,7 +263,8 @@ config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longreque
 config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
 config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
 config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
-config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
+{# BBB: zope_parameter_dict used to contain 'webdav', so fallback to it -#}
+config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_parameter_dict.get('webdav', False))) }}
 config-publication-deadline = {{ dumps(current_zope_family_override_dict.get('publication-deadline', global_publication_deadline)) }}
 config-activity-deadline = {{ dumps(current_zope_family_override_dict.get('activity-deadline', global_activity_deadline)) }}
 {%   if test_runner_enabled -%}