From 44d5a3495d01ffda7f4d6439160bce2b5bb779ec Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@tiolive.com>
Date: Wed, 23 Oct 2013 16:32:51 +0200
Subject: [PATCH] slaprunner: buildout directory vars are more correctly used
---
software/slaprunner/instance-runner.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg
index b1b44dced..ab39cdb0d 100644
--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
@@ -230,7 +230,7 @@ path_pid = $${directory:run}/nginx.pid
path_log = $${directory:log}/nginx.log
path_access_log = $${directory:log}/nginx.access.log
path_error_log = $${directory:log}/nginx.error.log
-path_tmp = $${buildout:directory}/tmp
+path_tmp = $${directory:tmp}/
# Config files
path_nginx_conf = $${directory:etc}/nginx.conf
# Executables
@@ -481,18 +481,18 @@ recipe = slapos.cookbook:shellinabox
ipv6 = ::1
port = 8080
shell = $${shell:wrapper}
-wrapper = $${buildout:directory}/bin/shellinaboxd
+wrapper = $${directory:bin}/shellinaboxd
shellinabox-binary = ${shellinabox:location}/bin/shellinaboxd
password =
directory = $${buildout:directory}/
-login-shell = $${buildout:directory}/bin/login
+login-shell = $${directory:bin}/login
certificate-directory = $${cadirectory:certs}
cert-file = $${ca-shellinabox:cert-file}
key-file = $${ca-shellinabox:key-file}
[shell]
recipe = slapos.cookbook:shell
-wrapper = $${buildout:directory}/bin/sh
+wrapper = $${directory:bin}/sh
shell = ${busybox:location}/bin/sh
home = $${buildout:directory}
ps1 = "\\w> "
--
2.30.9