Commit 323a96af authored by Tristan Cavelier's avatar Tristan Cavelier

erp5: fix http-monitor connection parameter url not found

parent 48b3707b
...@@ -180,7 +180,7 @@ context = ...@@ -180,7 +180,7 @@ context =
recipe = slapos.recipe.template recipe = slapos.recipe.template
filename = instance-http-monitor.cfg.in filename = instance-http-monitor.cfg.in
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
md5sum = d2ddadaa0459319745b78dc704200755 md5sum = 7fb20468f1825a82951a222df9c8b045
output = ${buildout:directory}/template-http-monitor.cfg.in output = ${buildout:directory}/template-http-monitor.cfg.in
##################e ##################e
...@@ -318,7 +318,7 @@ extra-context = ...@@ -318,7 +318,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 4afd0d660c67714d01c3c519c549eed0 md5sum = 69bb1bdfde41489c16ed5fef7484d672
[template-neo] [template-neo]
< = download-base < = download-base
......
...@@ -46,7 +46,7 @@ config-{{ option }} = {{ dumps(value) }} ...@@ -46,7 +46,7 @@ config-{{ option }} = {{ dumps(value) }}
{# Fail early if an unexpected value is provided -#} {# Fail early if an unexpected value is provided -#}
{% set possible_software_type_dict = {'zeo': 'zeo', 'neo': 'neo'} -%} {% set possible_software_type_dict = {'zeo': 'zeo', 'neo': 'neo'} -%}
{{ request('zodb', 'zodb-' ~ possible_software_type_dict[slapparameter_dict.get('zodb-software-type', 'zeo')], 'zodb', {'tcpv4-port': 2100, 'zodb-dict': {'root': {}}}, {'zodb-storage-type': False, 'zodb-dict': False, 'tidstorage-ip': False, 'tidstorage-port': False}) }} {{ request('zodb', 'zodb-' ~ possible_software_type_dict[slapparameter_dict.get('zodb-software-type', 'zeo')], 'zodb', {'tcpv4-port': 2100, 'zodb-dict': {'root': {}}}, {'zodb-storage-type': False, 'zodb-dict': False, 'tidstorage-ip': False, 'tidstorage-port': False}) }}
{{ request('http-monitor', 'http-monitor', 'http-monitor', {}) }} {{ request('http-monitor', 'http-monitor', 'http-monitor', {}, {'monitor-url': True}) }}
[inituser-password] [inituser-password]
{% set inituser_password = slapparameter_dict.get('inituser-password') -%} {% set inituser_password = slapparameter_dict.get('inituser-password') -%}
......
...@@ -18,6 +18,7 @@ parts = ...@@ -18,6 +18,7 @@ parts =
monitor-promise monitor-promise
monitor-instance-log-access monitor-instance-log-access
monitor-check-cache-hit monitor-check-cache-hit
publish-http-monitor
extends = ${monitor-template:output} extends = ${monitor-template:output}
...@@ -43,4 +44,8 @@ json_resolve_list = ["www.erp5.com:80:5.135.149.226"] ...@@ -43,4 +44,8 @@ json_resolve_list = ["www.erp5.com:80:5.135.149.226"]
recipe = slapos.cookbook:zero-knowledge.read recipe = slapos.cookbook:zero-knowledge.read
filename = $${public:filename} filename = $${public:filename}
[publish-http-monitor]
recipe = slapos.cookbook:publish.serialised
monitor-url = $${monitor-parameters:url}
{% endif %} {% endif %}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment