Commit faab3b37 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: shellinabox uses bash

parent d37c54c9
...@@ -476,9 +476,9 @@ context = ...@@ -476,9 +476,9 @@ context =
[shellinabox] [shellinabox]
recipe = slapos.cookbook:shellinabox recipe = slapos.cookbook:shellinabox
ipv6 = ::1 ipv6 = $${slap-network-information:global-ipv6}
port = 8080 port = 8080
shell = $${shell:wrapper} shell = ${bash:location}/bin/bash
wrapper = $${directory:bin}/shellinaboxd wrapper = $${directory:bin}/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
password = password =
...@@ -488,21 +488,6 @@ certificate-directory = $${cadirectory:certs} ...@@ -488,21 +488,6 @@ certificate-directory = $${cadirectory:certs}
cert-file = $${ca-shellinabox:cert-file} cert-file = $${ca-shellinabox:cert-file}
key-file = $${ca-shellinabox:key-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] [environ]
recipe = collective.recipe.environment recipe = collective.recipe.environment
...@@ -519,7 +504,6 @@ stop-on-error = true ...@@ -519,7 +504,6 @@ stop-on-error = true
reference = $${slap-parameter:slapos-reference} reference = $${slap-parameter:slapos-reference}
location = $${slapos-repo:location} 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 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] [prepare-software]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
...@@ -77,7 +77,7 @@ http { ...@@ -77,7 +77,7 @@ http {
proxy_pass http://unix:{{ socket }}; proxy_pass http://unix:{{ socket }};
} }
location /shellinabox { 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; proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd; auth_basic_user_file {{ param_nginx_frontend['etc_dir'] }}/.htpasswd;
...@@ -85,7 +85,9 @@ http { ...@@ -85,7 +85,9 @@ http {
proxy_buffering off; proxy_buffering off;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; 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-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $http_host;
} }
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment