From d8355631e00038fb3138344f82dba759e4c6d396 Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@nexedi.com>
Date: Tue, 6 Sep 2016 11:05:48 +0200
Subject: [PATCH] resilient: makes signature of copied file available in the
monitoring interface
---
stack/resilient/buildout.cfg | 4 ++--
stack/resilient/instance-pull-backup.cfg.in | 5 +++++
stack/resilient/pbsready-import.cfg.in | 8 ++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg
index 20ebc512b..ca17f75ce 100644
--- a/stack/resilient/buildout.cfg
+++ b/stack/resilient/buildout.cfg
@@ -50,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
-md5sum = 32343741db4ad7792a27af99da707bae
+md5sum = cb862ac8b6f979c9a80a7a6bec80bfd0
mode = 0644
[pbsready-export]
@@ -66,7 +66,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg
-md5sum = f3fd62d6b1247affa1b1ed5cf1547240
+md5sum = 7e77ba24ab6c2f66d2c534d10247d7f7
mode = 0644
[template-replicated]
diff --git a/stack/resilient/instance-pull-backup.cfg.in b/stack/resilient/instance-pull-backup.cfg.in
index 554a20263..870123775 100644
--- a/stack/resilient/instance-pull-backup.cfg.in
+++ b/stack/resilient/instance-pull-backup.cfg.in
@@ -11,6 +11,7 @@ parts =
backup-transfer-integrity-promise
resilient-genstatrss-wrapper
pbs-push-history-log
+ backup-signature-link
cron-pbs-status-feed
## Monitor for pbs
@@ -280,6 +281,10 @@ wrapper-path = $${directory:bin}/resilient-genstatrss.py
recipe = cns.recipe.symlink
symlink = $${pbs:rdiff-backup-data-folder}/restore.log = $${basedirectory:log}/pbs-push-history-log
+[backup-signature-link]
+recipe = cns.recipe.symlink
+symlink = $${directory:pbs-backup}/proof.signature = $${monitor-directory:private}/backup.signature
+
#----------------
#--
#-- Publish instance parameters.
diff --git a/stack/resilient/pbsready-import.cfg.in b/stack/resilient/pbsready-import.cfg.in
index 19b3f6112..a78f43cc2 100644
--- a/stack/resilient/pbsready-import.cfg.in
+++ b/stack/resilient/pbsready-import.cfg.in
@@ -29,6 +29,8 @@ parts =
backup-transfer-integrity-promise
resilient-publish-connection-parameter
+ backup-signature-link
+
[resilient-publish-connection-parameter]
notification-url = http://[$${notifier:host}]:$${notifier:port}/notify
takeover-url = http://[$${resilient-web-takeover-httpd-configuration-file:listening-ip}]:$${resilient-web-takeover-httpd-configuration-file:listening-port}/
@@ -160,3 +162,9 @@ url = http://[$${resilient-web-takeover-httpd-configuration-file:listening-ip}]:
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
+###########
+# Symlinks
+###########
+[backup-signature-link]
+recipe = cns.recipe.symlink
+symlink = $${basedirectory:backup}/proof.signature = $${monitor-directory:private}/backup.signature
\ No newline at end of file
--
2.30.9