Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
2d5ad1a1
Commit
2d5ad1a1
authored
Sep 27, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner : shellinabox is now deployed using the recipe,
and also with auto-auth
parent
516e7727
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
28 deletions
+43
-28
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+3
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+40
-10
software/slaprunner/nginx_conf.in
software/slaprunner/nginx_conf.in
+0
-17
No files found.
software/slaprunner/common.cfg
View file @
2d5ad1a1
...
@@ -9,7 +9,9 @@ extends =
...
@@ -9,7 +9,9 @@ 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/python-2.7/buildout.cfg
../../component/shellinabox/buildout.cfg
../../component/shellinabox/buildout.cfg
../../component/busybox/buildout.cfg
../../stack/flask.cfg
../../stack/flask.cfg
../../stack/shacache-client.cfg
../../stack/shacache-client.cfg
../../stack/resilient/buildout.cfg
../../stack/resilient/buildout.cfg
...
@@ -27,7 +29,7 @@ parts =
...
@@ -27,7 +29,7 @@ parts =
instance-runner-export
instance-runner-export
slapos-cookbook
slapos-cookbook
slapos-cfg-template
slapos-cfg-template
shellinabox
#
shellinabox
develop =
develop =
/opt/slapos.toolbox/
/opt/slapos.toolbox/
...
...
software/slaprunner/instance-runner.cfg
View file @
2d5ad1a1
...
@@ -6,6 +6,7 @@ parts =
...
@@ -6,6 +6,7 @@ parts =
certificate-authority
certificate-authority
ca-nginx
ca-nginx
ca-node-frontend
ca-node-frontend
ca-shellinabox
test-runner
test-runner
sshkeys-dropbear-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
dropbear-server-add-authorized-key
...
@@ -20,7 +21,8 @@ parts =
...
@@ -20,7 +21,8 @@ parts =
request-cloud9-frontend
request-cloud9-frontend
node-frontend-promise
node-frontend-promise
nginx-promise
nginx-promise
shellinabox-launcher
shell
shellinabox
environ
environ
slapos-cfg
slapos-cfg
slaprunner-wrapper
slaprunner-wrapper
...
@@ -50,6 +52,7 @@ promises = $${:etc}/promise/
...
@@ -50,6 +52,7 @@ promises = $${:etc}/promise/
test = $${:etc}/test/
test = $${:etc}/test/
nginx-data = $${directory:srv}/nginx
nginx-data = $${directory:srv}/nginx
ca-dir = $${:srv}/ssl
ca-dir = $${:srv}/ssl
shellinabox = $${:var}/shellinabox
[runnerdirectory]
[runnerdirectory]
...
@@ -297,6 +300,14 @@ wrapper = $${directory:services}/node-frontend
...
@@ -297,6 +300,14 @@ wrapper = $${directory:services}/node-frontend
# Put domain name
# Put domain name
name = example.com
name = example.com
[ca-shellinabox]
<= certificate-authority
recipe = slapos.cookbook:certificate_authority.request
executable = $${shellinabox:wrapper}
wrapper = $${directory:services}/shellinaboxd
key-file = $${shellinabox:key-file}
cert-file = $${shellinabox:cert-file}
#--------------------
#--------------------
#--
#--
#-- Request frontend
#-- Request frontend
...
@@ -438,15 +449,34 @@ context =
...
@@ -438,15 +449,34 @@ 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]
[shellinabox]
bin = ${shellinabox:location}/bin/shellinaboxd
recipe = slapos.cookbook:shellinabox
launcher = $${directory:services}/shellinaboxd
ipv6 = $${slap-network-information:global-ipv6}
path-pid = $${directory:run}/shellinaboxd.pid
port = 8080
shell = $${shell:wrapper}
[shellinabox-launcher]
wrapper = $${buildout:directory}/bin/shellinaboxd
recipe = slapos.cookbook:wrapper
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
command-line = $${shellinabox-frontend:bin} --cgi
password =
wrapper-path = $${shellinabox-frontend:launcher}
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
[shell]
recipe = slapos.cookbook:shell
wrapper = $${buildout: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
...
...
software/slaprunner/nginx_conf.in
View file @
2d5ad1a1
...
@@ -67,21 +67,4 @@ http {
...
@@ -67,21 +67,4 @@ 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;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment