slaprunner: fix

vars for the jinja are now all declared in the [slaprunner section]

software/slaprunner/instance-runner.cfg

@@ -107,6 +107,8 @@ cloud9-url = $${cloud9:access-url}
 wrapper = $${directory:services}/slaprunner
 debug = $${slap-parameter:debug}
 access-url = https://[$${:ipv6}]:$${:runner_port} 
+supd-temp-var = $${directory:etc}/supervisord.conf
+prox-db-var = $${slaprunner:working-directory}/proxy.db
 default_repo = $${slap-parameter:default_repo}
 default_sr = $${slap-parameter:default_sr}
 auto_deploy = $${slap-parameter:auto_deploy}
@@ -407,8 +409,6 @@ recipe = slapos.recipe.template:jinja2
 template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
 rendered = $${slaprunner:slapos.cfg}
 mode = 700
-supd-temp-var = $${directory:etc}/supervisord.conf
-prox-db-var = $${slaprunner:working-directory}/proxy.db
 context =
   key software_root runnerdirectory:software-root
   key instance_root runnerdirectory:instance-root
@@ -419,13 +419,13 @@ context =
   key slapgrid_cp slaprunner:slapgrid_cp
   key slapproxy slaprunner:slapproxy 
   key supervisor slaprunner:supervisor
-  key supervisord_config slapos-cfg:supd-temp-var
+  key supervisord_config slaprunner:supd-temp-var
   key runner_workdir slaprunner:working-directory
   key runner_port slaprunner:runner_port
   key ipv6 slaprunner:ipv6
   key etc_dir slaprunner:etc_dir
   key proxy_host slaprunner:ipv4
-  key proxy_database slapos-cfg:prox-db-var
+  key proxy_database slaprunner:prox-db-var
   key ssh_client slaprunner:ssh_client
   key public_key slaprunner:public_key
   key private_key slaprunner:private_key