slaprunner: shellinabox uses bash

software/slaprunner/instance-runner.cfg

@@ -476,9 +476,9 @@ context =
 
 [shellinabox]
 recipe = slapos.cookbook:shellinabox
-ipv6 = ::1
+ipv6 = $${slap-network-information:global-ipv6}
 port = 8080
-shell = $${shell:wrapper}
+shell = ${bash:location}/bin/bash
 wrapper = $${directory:bin}/shellinaboxd
 shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd 
 password =  
@@ -488,21 +488,6 @@ certificate-directory = $${cadirectory:certs}
 cert-file = $${ca-shellinabox:cert-file}
 key-file = $${ca-shellinabox:key-file}
 
-[shell]
-recipe = slapos.cookbook:shell
-wrapper = $${directory:bin}/sh
-shell = ${busybox:location}/bin/sh
-home = $${buildout:directory}
-ps1 = "\\w> "
-path =
-    ${busybox:location}/bin/
-    ${busybox:location}/usr/bin/
-    ${git:location}/bin/
-    ${python2.7:location}/bin/
-    ${buildout:bin-directory}/
-    ${busybox:location}/sbin/
-    ${busybox:location}/usr/sbin/
-
 [environ]
 recipe = collective.recipe.environment
 
@@ -519,7 +504,6 @@ stop-on-error = true
 reference = $${slap-parameter:slapos-reference}
 location = $${slapos-repo:location}
 command = cd $${:location} && ${git:location}/bin/git checkout $${:reference} && echo "$${directory:etc}/.project" && SR=$${slap-parameter:slapos-software} && if [ -n "$SR" ] && [ ! -f "$${directory:etc}/.project" ]; then echo workspace/slapos/$${slap-parameter:slapos-software}/ > $${directory:etc}/.project; fi
-update-command = $${:command}
 
 [prepare-software]
 recipe = slapos.cookbook:wrapper

software/slaprunner/nginx_conf.in

@@ -77,7 +77,7 @@ http {
             proxy_pass http://unix:{{ socket }};
         }
 	location /shellinabox {
-            proxy_pass  http://[::1]:{{ shellinabox_port }}/;
+            proxy_pass  http://{{ param_nginx_frontend['global-ip'] }}:{{ shellinabox_port }}/;
             proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
             auth_basic "Restricted";
             auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
@@ -85,7 +85,9 @@ http {
             proxy_buffering off;
             proxy_set_header        Host              $host;
             proxy_set_header        X-Real-IP         $remote_addr;
+	    proxy_set_header        X-Forwarded-Proto $scheme;
             proxy_set_header        X-Forwarded-For   $proxy_add_x_forwarded_for;
+	    proxy_set_header        X-Forwarded-Host  $http_host;
 	}
     }
 }