Commit 47db31b7 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Kazuhiko Shiozaki

monitor: fix httpd graceful

parent 8f6544cb
...@@ -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
...@@ -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
......
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
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