Make slapos-master compatible with the recent changes done in erp5 stack through !202

/reviewed-on !203

software/slapos-master/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 50834c59ded302034cafcce7315a55c3
+md5sum = 649137323f971026a6c62e357ce3f513
 
 [template-balancer]
 filename = instance-balancer.cfg.in

software/slapos-master/instance-erp5.cfg.in

@@ -36,6 +36,7 @@ config-{{ k }} = {{ dumps(v) }}
 {% for k, v in key_config.iteritems() -%}
 config-{{ k }} = {{ '${' ~ v ~ '}' }}
 {% endfor -%}
+config-name = {{ name }}
 {% endmacro -%}
 
 {{ request('memcached-persistent', 'kumofs', 'kumofs', {'tcpv4-port': 2000}, {'url': True, 'monitor-base-url': False}, key_config={'monitor-passwd': 'monitor-htpasswd:passwd'}) }}
@@ -199,6 +200,7 @@ config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longreque
 config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longrequest-logger-timeout', 1)) }}
 config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
 config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
+config-name = {{ partition_name }}
 {% endfor -%}
 
 {# if not explicitly configured, connect jupyter to first zope family, which  -#}
@@ -310,6 +312,7 @@ config-backend-path-dict = {{ dumps(zope_backend_path_dict) }}
 config-ssl-authentication-dict = {{ dumps(ssl_authentication_dict) }}
 config-shared-certificate-authority-path = ${directory:ca-dir} 
 config-monitor-passwd = ${monitor-htpasswd:passwd}
+config-name = ${:name}
 
 
 [request-frontend-base]
@@ -366,7 +369,7 @@ parts +=
   monitor-base
 
 [monitor-conf-parameters]
-monitor-title = ERP5 monitor
+monitor-title = ERP5
 password = ${monitor-htpasswd:passwd}
 
 [monitor-base-url-dict]