Commit 64082672 authored by Nicolas Wavrant's avatar Nicolas Wavrant

stack-monitor: ipv4 frontend added

parent c4d3a816
...@@ -17,6 +17,7 @@ executable = $${directory:bin}/monitor.py ...@@ -17,6 +17,7 @@ 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]
...@@ -249,6 +250,18 @@ cgid-pid-file = $${directory:run}/cgi-httpd-cgid.pid ...@@ -249,6 +250,18 @@ cgid-pid-file = $${directory:run}/cgi-httpd-cgid.pid
document-root = $${directory:www} document-root = $${directory:www}
error-log = $${directory:log}/cgi-httpd-error-log error-log = $${directory:log}/cgi-httpd-error-log
[monitor-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional
name = Monitor Frontend
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
config = url domain
config-url = $${monitor-parameters:access-url}
config-domain = $${slap-parameter:frontend-domain}
return = site_url domain
[cgi-httpd-wrapper] [cgi-httpd-wrapper]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
apache-executable = ${apache:location}/bin/httpd apache-executable = ${apache:location}/bin/httpd
...@@ -258,12 +271,12 @@ wrapper-path = $${ca-httpd:executable} ...@@ -258,12 +271,12 @@ 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 = $${publish-connection-informations:monitor_url} url = $${monitor-parameters:access-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
[publish-connection-informations] [publish-connection-informations]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
monitor_url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${cgi-httpd-configuration-file:listening-port}/index.cgi monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
IMPORTANT_monitor_info = change the monitor_password as soon as possible ! Default is : $${public:monitor-password} IMPORTANT_monitor_info = change the monitor_password as soon as possible ! Default is : $${public:monitor-password}
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