Commit 9338b587 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: shellinabox now protected by a publish password

parent c1c6ab14
...@@ -370,6 +370,7 @@ url = https://$${request-frontend:connection-domain} ...@@ -370,6 +370,7 @@ url = https://$${request-frontend:connection-domain}
cloud9_backend_url = $${node-frontend:access-url} cloud9_backend_url = $${node-frontend:access-url}
cloud9_url = https://$${request-cloud9-frontend:connection-domain} cloud9_url = https://$${request-cloud9-frontend:connection-domain}
ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port} ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
shell_password = $${shellinabox:password}
password_recovery_code = $${recovery-code:passwd} password_recovery_code = $${recovery-code:passwd}
#--------------------------- #---------------------------
...@@ -478,16 +479,29 @@ context = ...@@ -478,16 +479,29 @@ context =
recipe = slapos.cookbook:shellinabox recipe = slapos.cookbook:shellinabox
ipv6 = $${slap-network-information:global-ipv6} ipv6 = $${slap-network-information:global-ipv6}
port = 8080 port = 8080
shell = ${bash:location}/bin/bash shell = $${shell:wrapper}
wrapper = $${directory:bin}/shellinaboxd wrapper = $${directory:bin}/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
password = password = $${shellinabox-code:passwd}
directory = $${buildout:directory}/ directory = $${runnerdirectory:home}
login-shell = $${directory:bin}/login login-shell = $${directory:bin}/login
certificate-directory = $${cadirectory:certs} 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}
[shellinabox-code]
recipe = slapos.cookbook:generate.password
storage-path = $${directory:etc}/.scode
bytes = 4
[shell]
recipe = slapos.cookbook:shell
wrapper = $${directory:bin}/sh
shell = ${bash:location}/bin/bash
home = $${runnerdirectory:home}
path = $${environ:PATH}
ps1 = "\\w> "
[environ] [environ]
recipe = collective.recipe.environment recipe = collective.recipe.environment
......
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