From 74a617c562fda5efdbbf89bca893664880a36d8d Mon Sep 17 00:00:00 2001 From: Nicolas Wavrant <nicolas.wavrant@tiolive.com> Date: Mon, 10 Feb 2014 14:52:37 +0100 Subject: [PATCH] slaprunner: public url is now a published parameter --- software/slaprunner/instance-resilient.cfg.jinja2 | 3 ++- software/slaprunner/instance-runner.cfg | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2 index 505484bb8..3895ba9d4 100644 --- a/software/slaprunner/instance-resilient.cfg.jinja2 +++ b/software/slaprunner/instance-resilient.cfg.jinja2 @@ -17,7 +17,7 @@ parts += # 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 monitor_url IMPORTANT_monitor_info webdav_url +return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url IMPORTANT_monitor_info webdav_url public_url [publish-connection-informations] recipe = slapos.cookbook:publish @@ -30,6 +30,7 @@ ssh_command = ${request-runner:connection-ssh_command} monitor_url = ${request-runner:connection-monitor_url} IMPORTANT_monitor_info = ${request-runner:connection-IMPORTANT_monitor_info} webdav_url = ${request-runner:connection-webdav_url} +public_url = ${request-runner:connection-public_url} [slap-parameter] # Default parameters for distributed deployment diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index 00f030234..ad7b4b059 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -417,6 +417,7 @@ url = https://$${request-frontend:connection-domain} ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port} webdav_url = https://$${request-frontend:connection-domain}/share monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi +public_url = $${:url}/public/ #--------------------------- #-- -- 2.30.9