Commit 1acff275 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner : shellinabox module added to the slaprunner

parent 605bc253
...@@ -9,6 +9,7 @@ extends = ...@@ -9,6 +9,7 @@ extends =
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/nginx/buildout.cfg ../../component/nginx/buildout.cfg
../../component/rsync/buildout.cfg ../../component/rsync/buildout.cfg
../../component/shellinabox/buildout.cfg
../../stack/flask.cfg ../../stack/flask.cfg
../../stack/shacache-client.cfg ../../stack/shacache-client.cfg
../../stack/resilient/buildout.cfg ../../stack/resilient/buildout.cfg
...@@ -26,6 +27,7 @@ parts = ...@@ -26,6 +27,7 @@ parts =
instance-runner-export instance-runner-export
slapos-cookbook slapos-cookbook
slapos-cfg-template slapos-cfg-template
shellinabox
develop = develop =
/opt/slapos.toolbox/ /opt/slapos.toolbox/
...@@ -88,7 +90,7 @@ mode = 0644 ...@@ -88,7 +90,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg output = ${buildout:directory}/template-runner.cfg
md5sum = 1355283f0e79a890aeb687cedd8220ee #md5sum = 1355283f0e79a890aeb687cedd8220ee
mode = 0644 mode = 0644
[instance-runner-import] [instance-runner-import]
...@@ -122,7 +124,7 @@ mode = 0644 ...@@ -122,7 +124,7 @@ mode = 0644
[template_nginx_conf] [template_nginx_conf]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/nginx_conf.in url = ${:_profile_base_location_}/nginx_conf.in
md5sum = 09b7677dfc6b23c1f58e67fd06a7625e #md5sum = 09b7677dfc6b23c1f58e67fd06a7625e
filename = nginx_conf.in filename = nginx_conf.in
mode = 0644 mode = 0644
......
...@@ -20,6 +20,7 @@ parts = ...@@ -20,6 +20,7 @@ parts =
request-cloud9-frontend request-cloud9-frontend
node-frontend-promise node-frontend-promise
nginx-promise nginx-promise
shellinabox-launcher
environ environ
slapos-cfg slapos-cfg
slaprunner-wrapper slaprunner-wrapper
...@@ -437,6 +438,16 @@ context = ...@@ -437,6 +438,16 @@ context =
key default_sr slaprunner:default_sr key default_sr slaprunner:default_sr
key auto_deploy slaprunner:auto_deploy key auto_deploy slaprunner:auto_deploy
[shellinabox-frontend]
bin = ${shellinabox:location}/bin/shellinaboxd
launcher = $${directory:services}/shellinaboxd
path-pid = $${directory:run}/shellinaboxd.pid
[shellinabox-launcher]
recipe = slapos.cookbook:wrapper
command-line = $${shellinabox-frontend:bin} --cgi
wrapper-path = $${shellinabox-frontend:launcher}
[environ] [environ]
recipe = collective.recipe.environment recipe = collective.recipe.environment
......
...@@ -67,4 +67,21 @@ http { ...@@ -67,4 +67,21 @@ http {
proxy_set_header X-Forwarded-Host $http_host; proxy_set_header X-Forwarded-Host $http_host;
} }
} }
server {
listen [{{ param_nginx_frontend['global-ip'] }}]:4200 ssl;
server_name _;
ssl_certificate {{ param_nginx_frontend['ssl-certificate'] }};
ssl_certificate_key {{ param_nginx_frontend['ssl-key'] }};
ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers HIGH:!aNULL:!MD5;
keepalive_timeout 90s;
client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};
fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
location / {
proxy_pass http://localhost:4200;
}
}
} }
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