Commit f89c42fb authored by Hardik Juneja's avatar Hardik Juneja Committed by Rafael Monnerat

Fix my last patch (!189) for slapos master to make everything stable again

/reviewed-on !191
parent 6e19bd76
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# not need these here). # not need these here).
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = be397f283e5a21f9d986252072f42835 md5sum = 50834c59ded302034cafcce7315a55c3
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -291,6 +291,7 @@ name = balancer ...@@ -291,6 +291,7 @@ name = balancer
software-type = balancer software-type = balancer
{{ root_common.sla('balancer') }} {{ root_common.sla('balancer') }}
return = return =
monitor-base-url
{%- for family in zope_family_dict %} {%- for family in zope_family_dict %}
{{ family }} {{ family }}
{{ family }}-v6 {{ family }}-v6
...@@ -352,7 +353,7 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts- ...@@ -352,7 +353,7 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-
{% endfor -%} {% endfor -%}
[monitor-instance-parameter] [monitor-instance-parameter]
monitor-httpd-port = 8386 monitor-httpd-port = 8386
{{ root_common.common_section() }} {{ root_common.common_section() }}
...@@ -365,11 +366,11 @@ parts += ...@@ -365,11 +366,11 @@ parts +=
monitor-base monitor-base
[monitor-conf-parameters] [monitor-conf-parameters]
monitor-title = ERP5 monitor monitor-title = ERP5 monitor
password = ${monitor-htpasswd:passwd} password = ${monitor-htpasswd:passwd}
[monitor-base-url-dict] [monitor-base-url-dict]
{% for key, value in monitor_base_url_dict.items() -%} {% for key, value in monitor_base_url_dict.items() -%}
{{ key }} = {{ value }} {{ key }} = {{ value }}
{% endfor %} {% endfor %}
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