Commit 9ac4e7b3 authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: buildout directory vars are more correctly used

parent 4ee0f138
...@@ -230,7 +230,7 @@ path_pid = $${directory:run}/nginx.pid ...@@ -230,7 +230,7 @@ path_pid = $${directory:run}/nginx.pid
path_log = $${directory:log}/nginx.log path_log = $${directory:log}/nginx.log
path_access_log = $${directory:log}/nginx.access.log path_access_log = $${directory:log}/nginx.access.log
path_error_log = $${directory:log}/nginx.error.log path_error_log = $${directory:log}/nginx.error.log
path_tmp = $${buildout:directory}/tmp path_tmp = $${directory:tmp}/
# Config files # Config files
path_nginx_conf = $${directory:etc}/nginx.conf path_nginx_conf = $${directory:etc}/nginx.conf
# Executables # Executables
...@@ -481,18 +481,18 @@ recipe = slapos.cookbook:shellinabox ...@@ -481,18 +481,18 @@ recipe = slapos.cookbook:shellinabox
ipv6 = ::1 ipv6 = ::1
port = 8080 port = 8080
shell = $${shell:wrapper} shell = $${shell:wrapper}
wrapper = $${buildout:directory}/bin/shellinaboxd wrapper = $${directory:bin}/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
password = password =
directory = $${buildout:directory}/ directory = $${buildout:directory}/
login-shell = $${buildout: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}
[shell] [shell]
recipe = slapos.cookbook:shell recipe = slapos.cookbook:shell
wrapper = $${buildout:directory}/bin/sh wrapper = $${directory:bin}/sh
shell = ${busybox:location}/bin/sh shell = ${busybox:location}/bin/sh
home = $${buildout:directory} home = $${buildout:directory}
ps1 = "\\w> " ps1 = "\\w> "
......
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