From f89c42fbb74e9981f05bc3b83cb8181c949de38e Mon Sep 17 00:00:00 2001
From: Hardik Juneja <hardik.juneja@nexedi.com>
Date: Thu, 22 Jun 2017 14:23:10 +0200
Subject: [PATCH] Fix my last patch (!189) for slapos master to make everything
 stable again

/reviewed-on https://lab.nexedi.com/nexedi/slapos/merge_requests/191
---
 software/slapos-master/buildout.hash.cfg    |  2 +-
 software/slapos-master/instance-erp5.cfg.in | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/software/slapos-master/buildout.hash.cfg b/software/slapos-master/buildout.hash.cfg
index 11ce266378..f95f36d70e 100644
--- a/software/slapos-master/buildout.hash.cfg
+++ b/software/slapos-master/buildout.hash.cfg
@@ -15,7 +15,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = be397f283e5a21f9d986252072f42835
+md5sum = 50834c59ded302034cafcce7315a55c3
 
 [template-balancer]
 filename = instance-balancer.cfg.in
diff --git a/software/slapos-master/instance-erp5.cfg.in b/software/slapos-master/instance-erp5.cfg.in
index 1b5aec4913..45ae136a91 100644
--- a/software/slapos-master/instance-erp5.cfg.in
+++ b/software/slapos-master/instance-erp5.cfg.in
@@ -291,6 +291,7 @@ name = balancer
 software-type = balancer
 {{ root_common.sla('balancer') }}
 return =
+  monitor-base-url
 {%- for family in zope_family_dict %}
   {{ family }}
   {{ family }}-v6
@@ -352,7 +353,7 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-
 {% endfor -%}
 
 [monitor-instance-parameter]
- monitor-httpd-port = 8386
+monitor-httpd-port = 8386
 
 {{ root_common.common_section() }}
 
@@ -365,11 +366,11 @@ parts +=
   monitor-base
 
 [monitor-conf-parameters]
-  monitor-title = ERP5 monitor
-  password = ${monitor-htpasswd:passwd}
+monitor-title = ERP5 monitor
+password = ${monitor-htpasswd:passwd}
 
 [monitor-base-url-dict]
-  {% for key, value in monitor_base_url_dict.items() -%}
-  {{ key }} = {{ value }}
-  {% endfor %}
+{% for key, value in monitor_base_url_dict.items() -%}
+{{ key }} = {{ value }}
+{% endfor %}
 
-- 
2.25.1