abcdefg

software/slaprunner/buildout.hash.cfg

@@ -15,11 +15,11 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 44e8d6060774ccdd49766c4bda1b7926
+md5sum = ce0fb27e967b3fac24de6b8be270865e
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = c531ca046e137459d6cccb261eb7e540
+md5sum = c47875e7cf3924df260d7db2bf4dc3f1
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
@@ -35,7 +35,7 @@ md5sum = ef87691a9675beb646ae1c99ef69e551
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in
-md5sum = 00ddcaa6e571505d1930612d12de8fde
+md5sum = 0885f3b620051703167174a8622df8b1
 
 [template-resilient]
 filename = instance-resilient.cfg.jinja2

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

 [buildout]
 extends = {{ template_runner_path }}
+          {{ template_monitor }}
           {{ pbsready_export_template_path }}
 
 parts +=

software/slaprunner/instance-runner.cfg

@@ -41,7 +41,7 @@ parts =
 ## Usability part
   template-slapuser-script
 
-extends = {{template_monitor}}
+extends = {{ template_monitor }}
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}

software/slaprunner/instance.cfg

@@ -14,9 +14,9 @@ resilient = $${instance-resilient:rendered}
 runner = $${instance-base-runner:rendered}
 runner-import = $${template-runner-import:rendered}
 runner-export = $${template-runner-export:rendered}
+pull-backup = $${instance-pull-backup:rendered}
 
 frozen = ${instance-frozen:output}
-pull-backup = ${template-pull-backup:output}
 
 [instance-base-runner]
 recipe = slapos.recipe.template:jinja2
@@ -63,6 +63,7 @@ context =
   raw buildout_executable_location ${buildout:executable}
   raw bash_executable_location ${bash:location}/bin/bash
   raw rsync_executable_location ${rsync:location}/bin/rsync
+  raw template_monitor ${instance-monitor:rendered}
 
 [template-runner-import]
 recipe = slapos.recipe.template:jinja2
@@ -79,12 +80,20 @@ context =
   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}
 
+[instance-pull-backup]
+recipe = slapos.recepie.template:jinja2
+template = ${template-pull-backup:output}
+rendered = $${buildout:directory}/template-monitor.cfg
+mode = 640
+context =
+  raw template_monitor ${instance-monitor:rendered}
+
 [instance-monitor]
 recipe = slapos.recipe.template:jinja2
 template = ${monitor2-template:output}
 rendered = $${buildout:directory}/template-monitor.cfg
 extensions = jinja2.ext.do
-mode = 0644
+mode = 640
 
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration

stack/resilient/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = 1dee975a39b006b973df9a2c5a38d76b
+md5sum = 060b95d6e307d0acf9919343d66a8664
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
@@ -27,7 +27,7 @@ md5sum = c6c11db5372150019debb1ce519b907d
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 4716c376caad59c5f16547f66a276f63
+md5sum = 6ae296394642052e56aa934bc922c80d
 
 [template-replicated]
 filename = template-replicated.cfg.in

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

@@ -21,7 +21,7 @@ parts =
   monitor-base
   monitor-check-resilient-feed-file
 
-extends = $${instance-monitor:rendered}
+extends = {{ template_monitor }}
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true

stack/resilient/pbsready.cfg.in

@@ -18,10 +18,6 @@ parts +=
   sshd-pbs-authorized-key
   notifier
 
-
-extends =
-  $${instance-monitor:rendered}
-
 #----------------
 #--
 #-- Creation of all needed directories.
@@ -278,10 +274,3 @@ recipe = slapos.cookbook:publish
 ssh-public-key = $${sshkeys-sshd:public-key-value}
 ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
 ip = $${slap-network-information:global-ipv6}
-
-[instance-monitor]
-recipe = slapos.recipe.template:jinja2
-template = ${monitor2-template:output}
-rendered = $${buildout:directory}/template-monitor.cfg
-extensions = jinja2.ext.do
-mode = 0644