Commit 33d9b99d authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: simplification in monitoring frontend request

Conflicts:
	software/slaprunner/instance-runner.cfg
parent aa644e37
...@@ -64,4 +64,3 @@ url = $${monitor-frontend:config-url}/$${deploy-index:filename} ...@@ -64,4 +64,3 @@ url = $${monitor-frontend:config-url}/$${deploy-index:filename}
# Extends publish section with resilient parameters # Extends publish section with resilient parameters
[publish-connection-informations] [publish-connection-informations]
<= resilient-publish-connection-parameter <= resilient-publish-connection-parameter
monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
...@@ -23,7 +23,6 @@ parts = ...@@ -23,7 +23,6 @@ parts =
slapos-repo-config slapos-repo-config
cron-entry-prepare-software cron-entry-prepare-software
deploy-instance-parameters deploy-instance-parameters
publish-monitor-frontend
{% if slapparameter_dict.get('custom-frontend-backend-url') %} {% if slapparameter_dict.get('custom-frontend-backend-url') %}
custom-frontend-promise custom-frontend-promise
{% endif %} {% endif %}
...@@ -402,10 +401,6 @@ config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor- ...@@ -402,10 +401,6 @@ config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
return = site_url domain return = site_url domain
[publish-monitor-frontend]
recipe = slapos.cookbook:publish
monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
#-------------------------------------- #--------------------------------------
#-- #--
#-- Send informations to SlapOS Master #-- Send informations to SlapOS Master
...@@ -419,7 +414,7 @@ access_url = $${:url}/login ...@@ -419,7 +414,7 @@ access_url = $${:url}/login
url = https://$${request-frontend:connection-domain} url = https://$${request-frontend:connection-domain}
ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port} ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
webdav_url = https://$${request-frontend:connection-domain}/share webdav_url = https://$${request-frontend:connection-domain}/share
monitor_url = $${:url}:$${cgi-httpd-configuration-file:listening-port}/$${deploy-index:filename} monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
#--------------------------- #---------------------------
#-- #--
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment