Commit a7b47f99 authored by Nicolas Wavrant's avatar Nicolas Wavrant

stack-monitor: more logic added in paramaters for frontend

parent 69fbbfd4
...@@ -17,7 +17,6 @@ executable = $${directory:bin}/monitor.py ...@@ -17,7 +17,6 @@ executable = $${directory:bin}/monitor.py
cgi-bin = $${directory:cgi-bin} cgi-bin = $${directory:cgi-bin}
monitoring-cgi = $${directory:monitoring-cgi} monitoring-cgi = $${directory:monitoring-cgi}
knowledge0-cgi = $${directory:knowledge0-cgi} knowledge0-cgi = $${directory:knowledge0-cgi}
access-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${:port}
port = 9685 port = 9685
[directory] [directory]
...@@ -258,7 +257,7 @@ name = Monitor Frontend ...@@ -258,7 +257,7 @@ name = Monitor Frontend
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true slave = true
config = url domain config = url domain
config-url = $${monitor-parameters:access-url} config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}
config-domain = $${slap-parameter:frontend-domain} config-domain = $${slap-parameter:frontend-domain}
return = site_url domain return = site_url domain
...@@ -271,7 +270,7 @@ wrapper-path = $${ca-httpd:executable} ...@@ -271,7 +270,7 @@ wrapper-path = $${ca-httpd:executable}
[monitor-promise] [monitor-promise]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = $${directory:promises}/monitor path = $${directory:promises}/monitor
url = $${monitor-parameters:access-url}/$${deploy-index:filename} url = $${monitor-frontend:config-url}/$${deploy-index:filename}
check-secure = 1 check-secure = 1
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
......
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