Commit 0b87104f authored by Jérome Perrin's avatar Jérome Perrin

slaprunner: make sure paths don't contain double slash

This is "cleaner", but this will make the hash of software change, maybe
that's not a good idea.
This is because there's a test asserting the path and I felt it was
wrong to assert that part contain // ( but I'm starting to reconsider
this )
parent c242febe
......@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
[template-runner]
filename = instance-runner.cfg
md5sum = 58a6f21021279ae52c91813f61cdbdd7
md5sum = 72fd7bb8f9575bf1e25d13e2d910c3ea
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
......
......@@ -118,21 +118,21 @@ custom-frontend-url = $${custom-frontend-url-ready-promise:url}
[directory]
recipe = slapos.cookbook:mkdirectory
home = $${buildout:directory}
etc = $${:home}/etc/
var = $${:home}/var/
srv = $${:home}/srv/
bin = $${:home}/bin/
tmp = $${:home}/tmp/
etc = $${:home}/etc
var = $${:home}/var
srv = $${:home}/srv
bin = $${:home}/bin
tmp = $${:home}/tmp
sshkeys = $${:srv}/sshkeys
services = $${:etc}/service/
scripts = $${:etc}/run/
ssh = $${:etc}/ssh/
log = $${:var}/log/
run = $${:var}/run/
backup = $${:srv}/backup/
promises = $${:etc}/promise/
test = $${:etc}/test/
services = $${:etc}/service
scripts = $${:etc}/run
ssh = $${:etc}/ssh
log = $${:var}/log
run = $${:var}/run
backup = $${:srv}/backup
promises = $${:etc}/promise
test = $${:etc}/test
nginx-data = $${:srv}/nginx
ca-dir = $${:srv}/ssl
project = $${:srv}/runner/project
......@@ -140,8 +140,8 @@ cgi-bin = $${:srv}/cgi-bin
[runnerdirectory]
recipe = slapos.cookbook:mkdirectory
home = $${directory:srv}/runner/
test = $${directory:srv}/test/
home = $${directory:srv}/runner
test = $${directory:srv}/test
project = $${:home}/project
public = $${:home}/public
software-root = {{ slapparameter_dict.get('software-root', '$${:home}/software') }}
......
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