fixup! XXX: stack/resilient: fix monitor integration

stack/resilient/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 5e0dcd4c290f0b46cb2d316dc1c9c011
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
-md5sum = 9d36d08ac6ae351b598a67db41657cc6
+md5sum = d813c43ed00eff868fb13bc75b045336
 
 [pbsready-export]
 filename = pbsready-export.cfg.in

stack/resilient/pbsready-import.cfg.in

@@ -65,7 +65,7 @@ recipe = slapos.cookbook:notifier.callback
 on-notification-id = $${slap-parameter:on-notification}
 callback = $${post-notification-run:output}
 
-[backup-checksum-integrity-promise]
+[backup-checksum-integrity-promise-bin]
 recipe = slapos.recipe.template:jinja2
 template = inline:
   #!/${bash:location}/bin/bash
@@ -80,9 +80,16 @@ template = inline:
     # If file doesn't exist, promise shouldnt raise false positive
     exit 0;
   fi
-rendered = $${basedirectory:promises}/backup-checksum-integrity
+rendered = $${rootdirectory:bin}/backup-checksum-integrity
 mode = 700
 
+[backup-checksum-integrity-promise]
+<= monitor-promise-base
+module = check_command_execute
+name = backup-checksum-integrity.py
+config-command = $${backup-checksum-integrity-promise-bin:rendered}
+
+
 ###########
 # Generate the takeover script
 ###########
@@ -155,11 +162,10 @@ command-line = $${:apache-executable} -f $${resilient-web-takeover-httpd-configu
 wrapper-path = $${basedirectory:services}/resilient-web-takeover-httpd
 
 [resilient-web-takeover-httpd-promise]
-recipe = slapos.cookbook:check_url_available
-path = $${basedirectory:promises}/resilient-web-takeover-httpd
-url = http://[$${resilient-web-takeover-httpd-configuration-file:listening-ip}]:$${resilient-web-takeover-httpd-configuration-file:listening-port}/
-dash_path = ${dash:location}/bin/dash
-curl_path = ${curl:location}/bin/curl
+<= monitor-promise-base
+module = check_url_available
+name = resilient-web-takeover-httpd.py
+config-url = http://[$${resilient-web-takeover-httpd-configuration-file:listening-ip}]:$${resilient-web-takeover-httpd-configuration-file:listening-port}/
 
 ###########
 # Symlinks