ok

software/slaprunner/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = ae588c5904ac8d48a8d0d513a3d88881
+md5sum = 3cecaf1f9e4e80901447684277d59736
 
 [template-runner]
 filename = instance-runner.cfg
@@ -27,7 +27,7 @@ md5sum = 130193114cbbcd014af9704851410605
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = 58ceb151dcc7e89d29612bcd94efe2e4
+md5sum = cc0d45128df7003d5d7f69ff290d66e1
 
 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2
@@ -35,7 +35,7 @@ md5sum = ef87691a9675beb646ae1c99ef69e551
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = 0885f3b620051703167174a8622df8b1
+md5sum = a9da6eb01009c824182966ca78d2677f
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2

software/slaprunner/instance-runner-export.cfg.in

@@ -63,6 +63,9 @@ ip = ${slaprunner:ipv4}
 [supervisord]
 port = ${supervisord-free-port:port}
 
+[notifier]
+log-url = ${monitor-publish-parameters:monitor-base-url}/resilient/notifier-status-rss
+
 [exporter]
 recipe = slapos.recipe.template:jinja2
 template = {{ exporter_script_path }}

software/slaprunner/instance-runner-import.cfg.in

 [buildout]
 extends = {{ template_runner_path }}
           {{ pbsready_import_template_path }}
+          {{ template_monitor }}
 
 parts +=
   nginx_conf
@@ -75,6 +76,9 @@ recipe =
 [notifier]
 log-url = ${monitor-publish-parameters:monitor-base-url}/resilient/notifier-status-rss
 
+[resilient-web-takeover-cgi-script]
+proof-signature-url = $${monitor-publish-parameters:monitor-base-url}/private/resilient/backup.signature
+
 [importer]
 recipe = slapos.recipe.template:jinja2
 template = {{ importer_script_path }}

software/slaprunner/instance.cfg

@@ -79,6 +79,7 @@ context =
   raw rsync_executable_location ${rsync:location}/bin/rsync
   raw pbsready_import_template_path ${pbsready-import:output}
   raw software_release_information_template ${template-resilient-software-release-information:destination}/${template-resilient-software-release-information:filename}
+  raw template_monitor $${instance-monitor:rendered}
 
 [instance-pull-backup]
 recipe = slapos.recipe.template:jinja2

stack/resilient/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 6469cefecfeac19bf1f7cd26ab89c278
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
-md5sum = 9d36d08ac6ae351b598a67db41657cc6
+md5sum = d3cc6155cd70b435362320042098c9f2
 
 [pbsready-export]
 filename = pbsready-export.cfg.in

stack/resilient/pbsready-import.cfg.in

@@ -111,7 +111,6 @@ input = ${resilient-web-takeover-cgi-script-download:target}
 output = $${directory:cgi-bin}/web-takeover.cgi
 password = $${resilient-web-takeover-password:passwd}
 mode = 700
-proof-signature-url = $${monitor-publish-parameters:monitor-base-url}/private/resilient/backup.signature
 
 # XXX could it be something lighter?
 # XXX Add SSL