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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
47db31b7
Commit
47db31b7
authored
Jul 28, 2014
by
Cédric Le Ninivin
Committed by
Kazuhiko Shiozaki
Aug 07, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: fix httpd graceful
parent
8f6544cb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+8
-1
stack/monitor/monitor.cfg.in
stack/monitor/monitor.cfg.in
+8
-3
stack/monitor/wrapper.in
stack/monitor/wrapper.in
+2
-0
No files found.
stack/monitor/buildout.cfg
View file @
47db31b7
...
@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
...
@@ -41,7 +41,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/monitor.cfg.in
url = ${:_profile_base_location_}/monitor.cfg.in
output = ${buildout:directory}/monitor.cfg
output = ${buildout:directory}/monitor.cfg
filename = monitor.cfg
filename = monitor.cfg
md5sum =
20dc52c906e03a7c0b1234db7f999853
md5sum =
b330a6fbac771ef5db3e66933f6df8d0
mode = 0644
mode = 0644
[monitor-bin]
[monitor-bin]
...
@@ -148,3 +148,10 @@ download-only = true
...
@@ -148,3 +148,10 @@ download-only = true
destination = ${download-monitor-static:destination}
destination = ${download-monitor-static:destination}
filename = jquery-1.10.2.min.js
filename = jquery-1.10.2.min.js
mode = 0644
mode = 0644
[template-wrapper]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/wrapper.in
output = ${buildout:directory}/template-wrapper.cfg
mode = 0644
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
stack/monitor/monitor.cfg.in
View file @
47db31b7
...
@@ -264,9 +264,14 @@ command-line = $${:apache-executable} -f $${monitor-httpd-configuration-file:ren
...
@@ -264,9 +264,14 @@ command-line = $${:apache-executable} -f $${monitor-httpd-configuration-file:ren
wrapper-path = $${ca-httpd:executable}
wrapper-path = $${ca-httpd:executable}
[cgi-httpd-graceful-wrapper]
[cgi-httpd-graceful-wrapper]
recipe = slapos.cookbook:wrapper
recipe = slapos.recipe.template:jinja2
command-line = kill -USR1 $(cat $${monitor-httpd-configuration:pid-file})
template = ${template-wrapper:output}
wrapper-path = $${monitor-directory:etc-run}/cgi-httpd-graceful
rendered = $${monitor-directory:etc-run}/cgi-httpd-graceful
mode = 0700
context =
key content :command
command = kill -USR1 $(cat $${monitor-httpd-configuration:pid-file})
[monitor-promise]
[monitor-promise]
recipe = slapos.cookbook:check_url_available
recipe = slapos.cookbook:check_url_available
...
...
stack/monitor/wrapper.in
0 → 100644
View file @
47db31b7
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
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