slaprunner: certificates for shellinabox are placed with the others

software/slaprunner/instance-runner.cfg

@@ -54,7 +54,6 @@ promises = $${:etc}/promise/
 test = $${:etc}/test/
 nginx-data = $${directory:srv}/nginx
 ca-dir = $${:srv}/ssl
-shellinabox = $${:var}/shellinabox
 project = $${:srv}/runner/project/
 
 [runnerdirectory]
@@ -332,9 +331,8 @@ name = example.com
 recipe = slapos.cookbook:certificate_authority.request
 executable = $${shellinabox:wrapper}
 wrapper = $${directory:services}/shellinaboxd
-key-file = $${shellinabox:key-file}
-cert-file = $${shellinabox:cert-file}
-
+key-file = $${cadirectory:certs}/shellinabox.key
+cert-file = $${cadirectory:certs}/shellinabox.crt
 #--------------------
 #--
 #-- Request frontend
@@ -488,9 +486,9 @@ shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
 password =  
 directory = $${buildout:directory}/
 login-shell = $${buildout:directory}/bin/login
-certificate-directory = $${directory:shellinabox}
-cert-file = $${directory:shellinabox}/public.crt
-key-file = $${directory:shellinabox}/private.key
+certificate-directory = $${cadirectory:certs}
+cert-file = $${ca-shellinabox:cert-file}
+key-file = $${ca-shellinabox:key-file}
 
 [shell]
 recipe = slapos.cookbook:shell