ok another

software/kvm/common.cfg

@@ -89,7 +89,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = e5e140808f0f9f360e1afd38277edd65
+md5sum = a590d9011e57f058ffada5535382ab6a
 output = ${buildout:directory}/template.cfg
 mode = 0644
 

software/kvm/instance.cfg.in

@@ -68,7 +68,7 @@ extra-context =
   raw logrotate_cfg ${template-logrotate-base:rendered}
   raw template_content ${template-content:location}/${template-content:filename}
   raw template_httpd_cfg ${template-httpd:rendered}
-  raw template_monitor ${instance-monitor:rendered}
+  raw template_monitor $${instance-monitor:rendered}
 
 [dynamic-template-kvm]
 recipe = slapos.recipe.template:jinja2
@@ -101,7 +101,7 @@ context =
     raw template_content ${template-content:location}/${template-content:filename}
     raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
     raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
-    raw template_monitor ${instance-monitor:rendered}
+    raw template_monitor $${instance-monitor:rendered}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
@@ -119,7 +119,7 @@ context =
     key eggs_directory buildout:eggs-directory
     key slapparameter_dict slap-configuration:configuration
     raw curl_executable_location ${curl:location}/bin/curl
-    raw template_monitor ${instance-monitor:rendered}
+    raw template_monitor $${instance-monitor:rendered}
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
@@ -160,6 +160,6 @@ mode = 0644
 [instance-monitor]
 recipe = slapos.recipe.template:jinja2
 template = ${monitor2-template:output}
-rendered = ${buildout:directory}/template-monitor.cfg
+rendered = $${buildout:directory}/template-monitor.cfg
 extensions = jinja2.ext.do
 mode = 0644

software/powerdns/instance.cfg

@@ -47,8 +47,8 @@ extra-context =
 
 [instance-monitor]
 recipe = slapos.recipe.template:jinja2
-template = $${monitor2-template:output}
-rendered = ${buildout:directory}/template-monitor.cfg
+template = ${monitor2-template:output}
+rendered = $${buildout:directory}/template-monitor.cfg
 extensions = jinja2.ext.do
 mode = 0644
 

software/powerdns/software.cfg

@@ -18,7 +18,7 @@ eggs =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 8498018989045fb35335ea9cb85320a5
+md5sum = 879700e28acaf1fd868da00ce69e29a2
 output = ${buildout:directory}/template.cfg
 mode = 0644
 

software/slaprunner/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = ce0fb27e967b3fac24de6b8be270865e
+md5sum = ae588c5904ac8d48a8d0d513a3d88881
 
 [template-runner]
 filename = instance-runner.cfg

software/slaprunner/instance.cfg

@@ -30,7 +30,7 @@ context = key buildout buildout:bin-directory
           raw curl_executable_location ${curl:location}/bin/curl
           raw dash_executable_location ${dash:location}/bin/dash
           raw dcron_executable_location ${dcron:location}/sbin/crond
-          raw template_monitor ${instance-monitor:rendered}
+          raw template_monitor $${instance-monitor:rendered}
 mode = 0644
 
 [instance-resilient]
@@ -63,7 +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}
+  raw template_monitor $${instance-monitor:rendered}
 
 [template-runner-import]
 recipe = slapos.recipe.template:jinja2
@@ -81,12 +81,12 @@ context =
   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
+recipe = slapos.recipe.template:jinja2
 template = ${template-pull-backup:output}
-rendered = $${buildout:directory}/template-monitor.cfg
+rendered = $${buildout:directory}/template-pull-backup.cfg
 mode = 640
 context =
-  raw template_monitor ${instance-monitor:rendered}
+  raw template_monitor $${instance-monitor:rendered}
 
 [instance-monitor]
 recipe = slapos.recipe.template:jinja2

stack/erp5/buildout.cfg

@@ -301,7 +301,7 @@ context =
     key template_kumofs template-kumofs:target
     key template_mariadb template-mariadb:target
     key template_mariadb_initial_setup template-mariadb-initial-setup:target
-    key template_monitor monitor2-template:rendered
+    key template_monitor monitor2-template:output
     key template_my_cnf template-my-cnf:target
     key template_postfix template-postfix:target
     key template_postfix_aliases template-postfix-aliases:target

stack/resilient/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [pbsready]
 filename = pbsready.cfg.in
-md5sum = 060b95d6e307d0acf9919343d66a8664
+md5sum = ec11a0d1df5d5014f9004e88b1df1b79
 
 [pbsready-import]
 filename = pbsready-import.cfg.in

stack/resilient/pbsready.cfg.in

@@ -18,10 +18,6 @@ parts +=
   sshd-pbs-authorized-key
   notifier
 
-#----------------
-#--
-#-- Creation of all needed directories.
-
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc