proview-r: minor fix

software/proviewR/instance-proview-r.cfg.jinja2.in

@@ -216,8 +216,8 @@ mode = 0700
 rendered = ${directory:bin}/shellinaboxd
 template = inline:
   #!/bin/sh
-  exec {{ shellinabox_bin }}/shellinaboxd \
-    --unixdomain-only=$${:socket}:$(id -u):$(id -g):0600 \
+  exec {{ shellinabox_bin }} \
+    --unixdomain-only=${:socket}:$(id -u):$(id -g):0600 \
     --service "/:$(id -u):$(id -g):HOME:${shell-environment:shell} -l"
 
 [shellinabox-service]
@@ -234,7 +234,7 @@ shell = /bin/bash
 recipe = slapos.cookbook:certificate_authority.request
 key-file = ${cadirectory:certs}/nginx.key
 cert-file = ${cadirectory:certs}/nginx.crt
-executable = ${nginx-launcher:rendered}
+executable = ${nginx-launcher:wrapper-path}
 wrapper = ${directory:services}/nginx
 # Put domain name
 name = example.com
@@ -305,7 +305,7 @@ software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/a
 slave = true
 config-url = https://[$${nginx-parameter-conf:global-ip}]:$${nginx-parameter-conf:global-port}
 config-domain = 
-return = site_url domain
+return = secure_access domain
 
 
 [publish-connection-information]
@@ -313,8 +313,8 @@ return = site_url domain
 recipe = slapos.cookbook:publish
 backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1
 url = ${request-slave-frontend:connection-secure_access}/vnc.html?host=${request-slave-frontend:connection-domain}&port=443&encrypt=1
-shell-url = ${request-shellinabox-frontend:site_url}
-shell-backend = ${request-shellinabox-frontend:config-ur}
+shell-url = ${request-shellinabox-frontend:connection-secure_access}
+shell-backend = ${request-shellinabox-frontend:config-url}
 {% for name, value in publish_dict.items() -%}
 {{   name }} = {{ value }}
 {% endfor %}

software/proviewR/software.cfg

@@ -46,7 +46,7 @@ mode = 0644
 
 [template-proview-r]
 <= download-base
-md5sum = c730c798d630eb863c5030b81cae37d4
+#md5sum = b5d1278ac4158f659d0ccb88272ecbb3
 filename = instance-proview-r.cfg.jinja2.in
 
 [template-pwrp-profile]
@@ -62,7 +62,7 @@ filename = pwrrt.in
 [template-nginx-conf]
 <= download-base
 md5sum = 781977b1fa984d2529b1e1356ef0bb72
-filename = pwrrt.in
+filename = nginx_conf.in
 
 [versions]
 numpy = 1.16.4