slaprunner: update published connection parameters

fix publish custom frontend url
simplify monitoring connection parameters

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = a177a761d71257bec4d1ef1d2ee37ca4
+md5sum = 07839b433d0efefb559695e8954dfb32
 mode = 0644
 
 [template-runner-import-script]
@@ -92,7 +92,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = bf853ab13b564be991b42e74f631023a
+md5sum = 7b3f74b6ab491e907bbdef2ff40a7791
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -5,11 +5,13 @@
 # set to false (else it could be dangerous)
 {% do slapparameter_dict.__setitem__('auto-deploy', slapparameter_dict.get('auto-deploy', 'true')) %}
 {% do slapparameter_dict.__setitem__('auto-deploy-instance', slapparameter_dict.get('auto-deploy-instance', 'false')) %}
+{% do slapparameter_dict.__setitem__('instance-type', 'resilient') %}
 # let decide the number of clones we want. We can't have more than 2 clones
 {% set number_of_instances = slapparameter_dict.get('resilient-clone-number', 1)|int %}
 {% if number_of_instances > 2 %}
   {% set number_of_instances = 2 %}
 {% endif %}
+{% set slaprunner_return = ['url', 'ssh-public-key', 'ssh-url', 'notification-id', 'ip', 'backend_url', 'url', 'ssh_command', 'access_url', '1_info', '2_info', 'webdav_url', 'public_url', 'git_public_url', 'git_private_url'] -%}
 {% set monitor_return = ['monitor-base-url', 'monitor-url', 'monitor-user', 'monitor-password'] -%}
 {% set monitor_parameter = {'monitor-cors-domains': slapparameter_dict.pop('monitor-cors-domains', "monitor.app.officejs.com")} -%}
 {% set monitor_dict = {'parameter': monitor_parameter, 'return': monitor_return, 'set-monitor-url': True} -%}
@@ -46,7 +48,10 @@ etc = ${buildout:directory}/etc
 
 # Bubble up the parameters
 [request-runner]
-return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info webdav_url public_url git_public_url git_private_url {{ monitor_return | join(' ') }}
+{% if slapparameter_dict.get('custom-frontend-backend-url') -%}
+{%   do slaprunner_return.append('custom-frontend-url') -%}
+{% endif -%}
+return =  {{ slaprunner_return | join(' ')}} {{ monitor_return | join(' ') }}
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish
@@ -61,14 +66,10 @@ public_url = ${request-runner:connection-public_url}
 git_public_url = ${request-runner:connection-git_public_url}
 git_private_url = ${request-runner:connection-git_private_url}
 {% if slapparameter_dict.get('custom-frontend-backend-url') -%}
-custom-frontend-url = https://${request-custom-frontend:connection-domain}
+custom-frontend-url = ${request-runner:connection-custom-frontend-url}
 {% endif %}
-{% for key in monitor_return -%}
-{{ key }} = ${request-runner:connection-{{ key }}}
-{% endfor -%}
-{% if monitor_interface_url -%}
-monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=${request-runner:connection-monitor-url}
-{% endif -%}
+monitor-base-url = ${request-runner:connection-monitor-base-url}
+monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=${request-runner:connection-monitor-url}&username=${request-runner:connection-monitor-user}&password=${request-runner:connection-monitor-password}
 
 [slap-parameter]
 # Default parameters for distributed deployment

software/slaprunner/instance-runner.cfg

@@ -465,7 +465,7 @@ check-secure = 1
 [publish-connection-information]
 recipe = slapos.cookbook:publish
 1_info = On your first run, Use "access_url" to setup you account. Then you can use both "url" or "access_url". Or "backend_url" if you want to use ipv6. Set up your account in the webrunner in order to use webdav, and being able to clone your git repositories from the runner.
-2_info = In order to set up your account, get the recovery-code from the monitoring interface. Before read the notification on monitor_info.
+2_info = In order to set up your account, get the recovery-code from the monitoring interface. Use "monitor_setup_url" to configure monitor instance.
 backend_url = $${slaprunner:access-url}
 access_url = $${:url}/login
 url =  https://$${request-frontend:connection-domain}
@@ -475,12 +475,13 @@ public_url =  $${request-httpd-frontend:connection-secure_access}/public/
 git_public_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
 git_private_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
 monitor-base-url = $${publish:monitor-base-url}
+{% if slapparameter_dict.get('instance-type', '') != 'resilient' -%}
+{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
+monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url}&username=$${publish:monitor-user}&password=$${publish:monitor-password}
+{% else -%}
 monitor-url = $${publish:monitor-url}
 monitor-user = $${publish:monitor-user}
 monitor-password = $${publish:monitor-password}
-{% if not slapparameter_dict.get('authorized-key', '') -%}
-{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
-monitor_setup_url = {{ monitor_interface_url }}/#page=settings_configurator&url=$${publish:monitor-url}
 {% endif -%}
 #---------------------------
 #--