resilient: output of resilient activity is outputed in a new folder accessible by monitor

stack/resilient/buildout.cfg

@@ -41,7 +41,7 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready.cfg.in
 output = ${buildout:directory}/pbsready.cfg
-md5sum = 9eba09cd5f6e25f08eafbf1cb77582d5
+md5sum = 28590ed58034cd5228e7f2cb2e79df94
 mode = 0644
 
 [pbsready-import]
@@ -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 = cb862ac8b6f979c9a80a7a6bec80bfd0
+md5sum = f4e6831110ad5fcf29e3463f49556eee
 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 = 7e77ba24ab6c2f66d2c534d10247d7f7
+md5sum = 1fe040ac898aff363769a84125087f0c
 mode = 0644
 
 [template-replicated]

stack/resilient/instance-pull-backup.cfg.in

@@ -62,6 +62,7 @@ dot-ssh = $${basedirectory:ssh-home}/.ssh
 notifier-feeds = $${basedirectory:notifier}/feeds
 notifier-callbacks = $${basedirectory:notifier}/callbacks
 notifier-status-items = $${basedirectory:notifier}/status-items
+monitor-resilient = $${monitor-directory:private}/resilient
 
 
 #----------------
@@ -138,7 +139,7 @@ status-item-directory = $${directory:notifier-status-items}
 
 [pbs-resilient-status-feed]
 recipe = slapos.cookbook:wrapper
-command-line = ${buildout:directory}/bin/generateFeed --output $${monitor-directory:private}/pbs-status.rss --status-item-path $${pbs:status-item-directory} --title "Status feed for $${instance-info-parameters:root-name}-PBS" --link $${pbs:log-url}
+command-line = ${buildout:directory}/bin/generateFeed --output $${directory:monitor-resilient}/pbs-status-rss --status-item-path $${pbs:status-item-directory} --title "Status feed for $${instance-info-parameters:root-name}-PBS" --link $${pbs:log-url}
 wrapper-path = $${rootdirectory:bin}/resilient-genstatusrss.py
 
 [cron-pbs-status-feed]
@@ -283,7 +284,7 @@ symlink = $${pbs:rdiff-backup-data-folder}/restore.log = $${basedirectory:log}/p
 
 [backup-signature-link]
 recipe = cns.recipe.symlink
-symlink = $${directory:pbs-backup}/proof.signature = $${monitor-directory:private}/backup.signature
+symlink = $${directory:pbs-backup}/proof.signature = $${directory:monitor-resilient}/backup.signature
 
 #----------------
 #--

stack/resilient/pbsready-import.cfg.in

@@ -167,4 +167,4 @@ curl_path = ${curl:location}/bin/curl
 ###########
 [backup-signature-link]
 recipe = cns.recipe.symlink
-symlink = $${basedirectory:backup}/proof.signature = $${monitor-directory:private}/backup.signature
+symlink = $${basedirectory:backup}/proof.signature = $${directory:monitor-resilient}/backup.signature
\ No newline at end of file

stack/resilient/pbsready.cfg.in

@@ -52,6 +52,7 @@ cronstamps = $${rootdirectory:etc}/cronstamps
 logrotate-entries = $${rootdirectory:etc}/logrotate.d
 logrotate-backup = $${basedirectory:backup}/logrotate
 cgi-bin = $${rootdirectory:srv}/cgi-bin
+monitor-resilient = $${monitor-directory:private}/resilient
 
 #----------------
 #--