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

stack/resilient/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = e24d0567cda7c72e39f6c8fcb0ede7ab
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
-md5sum = da1d3229fe6d3664720d75b2e9d0b8f4
+md5sum = 730b83e1090054ae30b78bbb04d6a9f1
 
 [pbsready-export]
 filename = pbsready-export.cfg.in

stack/resilient/pbsready-import.cfg.in

@@ -4,7 +4,7 @@ extends = {{ pbsready_template_path }}
 parts +=
   resiliency-takeover-script
   resilient-web-takeover-cgi-script
-  resilient-web-takeover-httpd-wrapper
+  resilient-web-takeover-httpd-service-wrapper
   resilient-web-takeover-httpd-promise
 
   notify-callback
@@ -153,7 +153,20 @@ error-log = $${directory:log}/resilient-web-takeover-httpd-error-log
 recipe = slapos.cookbook:wrapper
 apache-executable = ${apache:location}/bin/httpd
 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]
 <= monitor-promise-base