Commit fa39a169 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

stack/resilient: use wrapper from monitor stack for resilient-web-takeover-httpd

parent c57c2213
Pipeline #37127 failed with stage
in 0 seconds
...@@ -18,7 +18,7 @@ md5sum = e24d0567cda7c72e39f6c8fcb0ede7ab ...@@ -18,7 +18,7 @@ md5sum = e24d0567cda7c72e39f6c8fcb0ede7ab
[pbsready-import] [pbsready-import]
filename = pbsready-import.cfg.in filename = pbsready-import.cfg.in
md5sum = da1d3229fe6d3664720d75b2e9d0b8f4 md5sum = 730b83e1090054ae30b78bbb04d6a9f1
[pbsready-export] [pbsready-export]
filename = pbsready-export.cfg.in filename = pbsready-export.cfg.in
......
...@@ -4,7 +4,7 @@ extends = {{ pbsready_template_path }} ...@@ -4,7 +4,7 @@ extends = {{ pbsready_template_path }}
parts += parts +=
resiliency-takeover-script resiliency-takeover-script
resilient-web-takeover-cgi-script resilient-web-takeover-cgi-script
resilient-web-takeover-httpd-wrapper resilient-web-takeover-httpd-service-wrapper
resilient-web-takeover-httpd-promise resilient-web-takeover-httpd-promise
notify-callback notify-callback
...@@ -153,7 +153,20 @@ error-log = $${directory:log}/resilient-web-takeover-httpd-error-log ...@@ -153,7 +153,20 @@ error-log = $${directory:log}/resilient-web-takeover-httpd-error-log
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
apache-executable = ${apache:location}/bin/httpd apache-executable = ${apache:location}/bin/httpd
command-line = $${:apache-executable} -f $${resilient-web-takeover-httpd-configuration-file:output} -DFOREGROUND command-line = $${:apache-executable} -f $${resilient-web-takeover-httpd-configuration-file:output} -DFOREGROUND
wrapper-path = $${basedirectory:services}/resilient-web-takeover-httpd wrapper-path = $${rootdirectory:bin}/resilient-web-takeover-httpd
[resilient-web-takeover-httpd-service-wrapper]
recipe = slapos.recipe.template:jinja2
url = ${template-monitor-httpd-wrapper:location}/${template-monitor-httpd-wrapper:filename}
output = $${basedirectory:services}/resilient-web-takeover-httpd
monitor-httpd-wrapper-path = $${resilient-web-takeover-httpd-wrapper:wrapper-path}
pid-file = $${directory:run}/resilient-web-takeover-httpd.pid
monitor-httpd-conf = $${resilient-web-takeover-httpd-configuration-file:output}
context =
key pid_file :pid-file
key monitor_httpd_wrapper_path :monitor-httpd-wrapper-path
key monitor_httpd_conf :monitor-httpd-conf
raw dash_binary ${bash:location}/bin/bash
[resilient-web-takeover-httpd-promise] [resilient-web-takeover-httpd-promise]
<= monitor-promise-base <= monitor-promise-base
......
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