Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
a7b47f99
Commit
a7b47f99
authored
Jan 29, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack-monitor: more logic added in paramaters for frontend
parent
69fbbfd4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
stack/monitor/monitor.cfg.in
stack/monitor/monitor.cfg.in
+2
-3
No files found.
stack/monitor/monitor.cfg.in
View file @
a7b47f99
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment