caddy-frontend: Use requestoptional.serialised

software/caddy-frontend/buildout.hash.cfg

@@ -26,11 +26,11 @@ md5sum = 5cfc4dd69c2800906d6648c626023cf0
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in
-md5sum = 8d34141a9cd1e51462aba845c7bea85b
+md5sum = 3c6ac85aa0f9f4692eb8a9af00ecfbd0
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 8f29aaf247a6b8354292c78abe7a5ad6
+md5sum = 070df949297b0ed9f001166749629bf9
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -46,7 +46,7 @@ md5sum = 7c987ad75fcce6f5b925c7696ff41971
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 8f29aaf247a6b8354292c78abe7a5ad6
+md5sum = 070df949297b0ed9f001166749629bf9
 
 [caddy-backend-url-validator]
 filename = templates/caddy-backend-url-validator.in

software/caddy-frontend/instance-apache-replicate.cfg.in

@@ -95,7 +95,7 @@ monitor-httpd-port = {{ slapparameter_dict.get('monitor-httpd-port', '8196') }}
 
 [replicate]
 <= slap-connection
-recipe = slapos.cookbook:requestoptional
+recipe = slapos.cookbook:requestoptional.serialised
 config-monitor-cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 config-monitor-username = ${monitor-instance-parameter:username}
 config-monitor-password = ${monitor-htpasswd:passwd}
@@ -121,7 +121,9 @@ state = {{ frontend_request.get('state') }}
 {%   do slave_configuration_dict.update(frontend_request.get('config')) %}
 {%   do slave_configuration_dict.__setitem__(slave_list_name, json_module.dumps(authorized_slave_list)) %}
 {%   do slave_configuration_dict.__setitem__("frontend-name", frontend_request.get('name')) %}
-config-_ = {{ json_module.dumps(slave_configuration_dict) }}
+{%-   for config_key, config_value in slave_configuration_dict.iteritems() %}
+config-{{ config_key }} = {{ dumps(config_value) }}
+{%   endfor -%}
 {%   if frontend_request.get('sla') %}
 {%     for parameter, value in frontend_request.get('sla').iteritems() %}
 sla-{{ parameter }} = {{ value }}

software/caddy-frontend/templates/apache-custom-slave-list.cfg.in

@@ -387,7 +387,7 @@ extra-context =
 
 {# Publish information for the instance #}
 [publish-caddy-information]
-recipe = slapos.cookbook:publish
+recipe = slapos.cookbook:publish.serialised
 public-ipv4 = {{ public_ipv4 }}
 private-ipv4 = {{ local_ipv4 }}
 {% if extra_slave_instance_list %}