diff --git a/software/erp5/instance-erp5-input-schema.json b/software/erp5/instance-erp5-input-schema.json index dd4ebc1eec71f47ef0d1822201ce076699beb0fb..0dea4347c70828badfd63ca6d468f96ce4562302 100644 --- a/software/erp5/instance-erp5-input-schema.json +++ b/software/erp5/instance-erp5-input-schema.json @@ -97,7 +97,7 @@ }, "publisher-timeout": { "description": "How long a publisher-initiated transaction may last, in seconds", - "default": null, + "default": 300, "type": [ "number", "null" diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index 7cfdf2bba8381b4735636b15a59f19131ab7d084..ea6f4e51b6a1f91f2852b7fa69897407283ffd61 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -74,7 +74,7 @@ md5sum = 9a7f7888ba4183c9d900e862074f3baf [template-erp5] filename = instance-erp5.cfg.in -md5sum = f5a1661449c9681b3de7d4af645124ba +md5sum = fcecee930aa05a1a739f31b28f6e4769 [template-zeo] filename = instance-zeo.cfg.in diff --git a/stack/erp5/instance-erp5.cfg.in b/stack/erp5/instance-erp5.cfg.in index 974f30cda5bbc8376aa06c8a9b34fcf9d398042e..f351e01614dc504146d3808f9dbf2c008f734c14 100644 --- a/stack/erp5/instance-erp5.cfg.in +++ b/stack/erp5/instance-erp5.cfg.in @@ -265,7 +265,7 @@ config-wcfs_enable = {{ dumps(wcfs_enable) }} config-test-runner-configuration = {{Â dumps(slapparameter_dict.get('test-runner', {})) }} software-type = zope -{% set global_publisher_timeout = slapparameter_dict.get('publisher-timeout') -%} +{% set global_publisher_timeout = slapparameter_dict.get('publisher-timeout', 300) -%} {% set global_activity_timeout = slapparameter_dict.get('activity-timeout') -%} {% set zope_family_dict = {} -%} {% set zope_family_name_list = [] -%}