convert instance-pull-backup.cfg.in into jinja2 template

software/slaprunner/buildout.hash.cfg

@@ -15,7 +15,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 3cecaf1f9e4e80901447684277d59736
+md5sum = 02b2af53bcffdf286cb4b30c4a1e7ba1
 
 [template-runner]
 filename = instance-runner.cfg
@@ -27,7 +27,7 @@ md5sum = 130193114cbbcd014af9704851410605
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = cc0d45128df7003d5d7f69ff290d66e1
+md5sum = 724514c494eab24189ed0b5db718aefd
 
 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2

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

@@ -77,7 +77,7 @@ recipe =
 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
+proof-signature-url = ${monitor-publish-parameters:monitor-base-url}/private/resilient/backup.signature
 
 [importer]
 recipe = slapos.recipe.template:jinja2

software/slaprunner/instance.cfg

@@ -83,11 +83,24 @@ context =
 
 [instance-pull-backup]
 recipe = slapos.recipe.template:jinja2
-template = ${template-pull-backup:output}
+template = ${template-pull-backup:target}
 rendered = $${buildout:directory}/template-pull-backup.cfg
 mode = 640
 context =
+  key buildout_directory buildout:directory
+  key develop_eggs_directory buildout:develop-eggs-directory
+  key eggs_directory buildout:eggs-directory
+  raw bin_directory ${buildout:bin-directory}
+  raw buildout_executable ${buildout:executable}
+  raw template_wrapper ${template-wrapper:output}
+  raw dcron_location ${dcron:location}
+  raw logrotate_location ${logrotate:location}
   raw template_monitor $${instance-monitor:rendered}
+  raw gzip_location ${gzip:location}
+  raw openssh_location ${openssh:location}
+  raw notifier_feed_promise_template ${notifier-feed-promise-template:target}
+  raw monitor_resilient_feed_path ${template-monitor-check-resilient-feed:location}/${template-monitor-check-resilient-feed:filename}
+  raw dash_location ${dash:location}/bin/dash
 
 [instance-monitor]
 recipe = slapos.recipe.template:jinja2

stack/resilient/buildout.cfg

@@ -60,9 +60,9 @@ filename = pbsready-export.cfg.in
 mode = 0644
 
 [template-pull-backup]
-recipe = slapos.recipe.template
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
-output = ${buildout:directory}/instance-pull-backup.cfg
+filename = instance-pull-backup.cfg
 mode = 0644
 
 [template-replicated]

stack/resilient/buildout.hash.cfg

@@ -19,15 +19,15 @@ md5sum = 6469cefecfeac19bf1f7cd26ab89c278
 
 [pbsready-import]
 filename = pbsready-import.cfg.in
-md5sum = d3cc6155cd70b435362320042098c9f2
+md5sum = ebbe28a5f62732185a17bb03936cc02e
 
 [pbsready-export]
 filename = pbsready-export.cfg.in
-md5sum = c6c11db5372150019debb1ce519b907d
+md5sum = 7bfec1a954fe06f9ca26ced7c06dc22e
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = 6ae296394642052e56aa934bc922c80d
+md5sum = dcb88393905f2334c8351f5878859635
 
 [template-replicated]
 filename = template-replicated.cfg.in

stack/resilient/pbsready-export.cfg.in

@@ -21,10 +21,11 @@ maximum = 22209
 ip = ${slap-network-information:global-ipv6}
 
 [notifier-port]
-recipe = slapos.cookbook:free_port
-minimum = 65526
-maximum = 65535
-ip = ${notifier:host}
+port = 65529
+#recipe = slapos.cookbook:free_port
+#minimum = 65526
+#maximum = 65535
+#ip = ${notifier:host}
 
 [resilient-publish-connection-parameter]
 notification-id = http://[${notifier:host}]:${notifier:port}/get/${notifier-exporter:name}

stack/resilient/pbsready-import.cfg.in

@@ -34,10 +34,11 @@ ip = $${slap-network-information:global-ipv6}
 
 # Define port of notifier (same reason)
 [notifier-port]
-recipe = slapos.cookbook:free_port
-minimum = 65516
-maximum = 65525
-ip = $${notifier:host}
+port = 65517
+#recipe = slapos.cookbook:free_port
+#minimum = 65516
+#maximum = 65525
+#ip = $${notifier:host}
 
 [import-on-notification]
 # notifier.callback runs a script when a notification (sent by a parent PBS)