diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index 7fc3817bd6c484005ab0e7b2495458ec98d5a435..73dff9a00201019d44e036f7c66a338c1c2647a1 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -66,7 +66,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0 [template] filename = instance.cfg.in -md5sum = 330b72acf0752cce5da70b1fcdfac487 +md5sum = 3864676250334cbc0fef243c897f3a11 [monitor-template-dummy] filename = dummy.cfg @@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e [template-erp5] filename = instance-erp5.cfg.in -md5sum = 9f8851af5faed9d1e346d7dbe0e6db5d +md5sum = 3ead44530bb2126101b56a8f24608879 [template-zeo] filename = instance-zeo.cfg.in diff --git a/stack/erp5/instance-erp5.cfg.in b/stack/erp5/instance-erp5.cfg.in index a360ba085c3e2e61312a7127097b184c62d7a16f..e15be2f12b8431df6b743edc566eeebbdf5ac275 100644 --- a/stack/erp5/instance-erp5.cfg.in +++ b/stack/erp5/instance-erp5.cfg.in @@ -14,6 +14,7 @@ {% set crl_update_period = slapparameter_dict.get('caucase', {}).pop('crl-update-periodicity', 'daily') -%} [request-common] <= request-common-base +state = {{ instance_state }} config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} {% macro request(name, software_type, config_key, config, ret={'url': True}, key_config={}) -%} diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in index 4d156885773d14efc9d03c2cf256d4b0989219ae..1f0179fa25d075a920f70d03749d194b7d5df931 100644 --- a/stack/erp5/instance.cfg.in +++ b/stack/erp5/instance.cfg.in @@ -37,6 +37,7 @@ template = {{ template_erp5 }} filename = instance-erp5.cfg extra-context = key default_cloudooo_url dynamic-template-erp5-parameters:default-cloudooo-url + key instance_state slap-configuration:instance-state key jupyter_enable_default dynamic-template-erp5-parameters:jupyter-enable-default key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository key template_monitor dynamic-template-erp5-parameters:template-monitor