diff --git a/software/resdemo/instance-resilient.cfg.jinja2 b/software/resdemo/instance-resilient.cfg.jinja2 index f33d54795a8846133919fac45e3ff344a21cb3d5..0fa353c00d564e64c9a151fe9cabe46e992e00f5 100644 --- a/software/resdemo/instance-resilient.cfg.jinja2 +++ b/software/resdemo/instance-resilient.cfg.jinja2 @@ -1,7 +1,7 @@ # vim: set ft=cfg: {% import 'parts' as parts %} -{% import 'replicated' as replicated %} +{% import 'replicated' as replicated with context %} [buildout] eggs-directory = {{ eggs_directory }} diff --git a/software/resdemo/instance.cfg.in b/software/resdemo/instance.cfg.in index f3bb3e98c0f2ca56f9c57320349c2f6f52ef9ba7..2b9435fdd6bb486794fbfb351e352d0c873366b6 100644 --- a/software/resdemo/instance.cfg.in +++ b/software/resdemo/instance.cfg.in @@ -10,7 +10,7 @@ offline = true [switch_softwaretype] recipe = slapos.cookbook:softwaretype default = ${instance-apache-php:output} -resilient = ${instance-resilient:rendered} +resilient = $${dynamic-template-resilient:rendered} apache-import = ${instance-apache-import:output} apache-export = ${instance-apache-export:rendered} @@ -19,3 +19,27 @@ apache-export = ${instance-apache-export:rendered} frozen = ${instance-frozen:output} pull-backup = ${template-pull-backup:output} +[slap-configuration] +recipe = slapos.cookbook:slapconfiguration.serialised +computer = $${slap-connection:computer-id} +partition = $${slap-connection:partition-id} +url = $${slap-connection:server-url} +key = $${slap-connection:key-file} +cert = $${slap-connection:cert-file} + +[dynamic-template-resilient] +recipe = slapos.recipe.template:jinja2 +template = ${template-resilient:location}/instance-resilient.cfg.jinja2 +rendered = $${buildout:directory}/template-resilient.cfg +extensions = jinja2.ext.do +context = + key buildout buildout:bin-directory + key develop_eggs_directory buildout:develop-eggs-directory + key eggs_directory buildout:eggs-directory + key slapparameter_dict slap-configuration:configuration +template-parts-destination = ${template-parts:destination} +template-replicated-destination = ${template-replicated:destination} +import-list = file parts :template-parts-destination + file replicated :template-replicated-destination +mode = 0644 + diff --git a/software/resdemo/software.cfg b/software/resdemo/software.cfg index 791df3633ff6cb8bb7e4d5d6653fca11de82b96e..ed41ee47e0817b41af7e49e4395fb41146326069 100644 --- a/software/resdemo/software.cfg +++ b/software/resdemo/software.cfg @@ -97,7 +97,7 @@ strip-top-level-dir = true recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg.in output = ${buildout:directory}/instance.cfg -md5sum = 7c43cd86aace6a0df1375ae1f68c2fb6 +md5sum = 81a98c2d479287361b068a43060ae5f1 mode = 0644 [instance-apache-php] @@ -129,21 +129,13 @@ import-list = file parts template-parts:destination md5sum = 0df9f940fcdb50d9697a9e59cdee566c mode = 0644 -[instance-resilient] -recipe = slapos.recipe.template:jinja2 -template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2 -rendered = ${buildout:directory}/instance-resilient.cfg -extensions = jinja2.ext.do - -context = key buildout buildout:bin-directory - key develop_eggs_directory buildout:develop-eggs-directory - key eggs_directory buildout:eggs-directory - -import-list = file parts template-parts:destination - file replicated template-replicated:destination - -md5sum = 6ff8c4b87c32b919e35147926925d030 -mode = 0644 +[template-resilient] +recipe = hexagonit.recipe.download +url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2 +mode = 644 +md5sum = 79ff4b0959dc00461c5a4e02550423d9 +download-only = true +on-update = true #----------------