slaprunner: deploys well instance-runner for jinja templatization

software/slaprunner/common.cfg

@@ -91,7 +91,7 @@ mode = 0644
 [template-runner]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
-output = ${buildout:directory}/template-runner.cfg
+output = ${buildout:directory}/template-runner.cfg.in
 #md5sum = 77cd9bfc7887ab53c8d3b530d2f753eb
 mode = 0644
 

software/slaprunner/instance.cfg

@@ -7,16 +7,30 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 
 [switch_softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${template-runner:output}
+default = $${instance-frontend:rendered}
 resilient = $${instance-resilient:rendered}
 test = $${instance-resilient-test:rendered}
-runner = ${template-runner:output}
+runner = $${instance-frontend:rendered}
 runner-import = ${instance-runner-import:output}
 runner-export = ${instance-runner-export:output}
 
 frozen = ${instance-frozen:output}
 pull-backup = ${template-pull-backup:output}
 
+[instance-frontend]
+recipe = slapos.recipe.template:jinja2
+template = ${template-runner:output}
+rendered = $${buildout:directory}/template-runner.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
+          raw curl_executable_location ${curl:location}/bin/curl
+          raw dash_executable_location ${dash:location}/bin/dash
+          raw dcron_executable_location ${dcron:location}/sbin/crond
+mode = 0644
+
 [instance-resilient]
 recipe = slapos.recipe.template:jinja2
 template = ${template-resilient:target}