From 3cb3f68e37945c9be00ad82a65c7a346d22a9fe1 Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Mon, 11 Feb 2013 10:34:50 +0100 Subject: [PATCH] stop add / at the end of each path --- software/erp5testnode/instance-default.cfg | 34 +++++++++++----------- software/erp5testnode/software.cfg | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/software/erp5testnode/instance-default.cfg b/software/erp5testnode/instance-default.cfg index 3b89599ce..8aae80e07 100644 --- a/software/erp5testnode/instance-default.cfg +++ b/software/erp5testnode/instance-default.cfg @@ -63,7 +63,7 @@ wrapper = $${basedirectory:services}/erp5testnode # Binaries apache-binary = ${apache:location}/bin/httpd -apache-modules-dir = ${apache:location}/modules/ +apache-modules-dir = ${apache:location}/modules apache-mime-file = ${apache:location}/conf/mime.types apache-htpasswd = ${apache:location}/bin/htpasswd @@ -133,28 +133,28 @@ cert-file = $${testnode:httpd-cert-file} [rootdirectory] recipe = slapos.cookbook:mkdirectory -etc = $${buildout:directory}/etc/ -var = $${buildout:directory}/var/ -srv = $${buildout:directory}/srv/ -bin = $${buildout:directory}/bin/ -tmp = $${buildout:directory}/tmp/ +etc = $${buildout:directory}/etc +var = $${buildout:directory}/var +srv = $${buildout:directory}/srv +bin = $${buildout:directory}/bin +tmp = $${buildout:directory}/tmp [basedirectory] recipe = slapos.cookbook:mkdirectory -log = $${rootdirectory:var}/log/ -services = $${rootdirectory:etc}/run/ -run = $${rootdirectory:var}/run/ -promises = $${rootdirectory:etc}/promise/ +log = $${rootdirectory:var}/log +services = $${rootdirectory:etc}/run +run = $${rootdirectory:var}/run +promises = $${rootdirectory:etc}/promise [directory] recipe = slapos.cookbook:mkdirectory -slapos = $${rootdirectory:srv}/slapos/ -testnode = $${rootdirectory:srv}/testnode/ -test-suite = $${rootdirectory:srv}/test_suite/ -log = $${basedirectory:log}/testnode/ -run = $${basedirectory:run}/testnode/ -shellinabox = $${rootdirectory:srv}/shellinabox/ -ca-dir = $${rootdirectory:srv}/ca/ +slapos = $${rootdirectory:srv}/slapos +testnode = $${rootdirectory:srv}/testnode +test-suite = $${rootdirectory:srv}/test_suite +log = $${basedirectory:log}/testnode +run = $${basedirectory:run}/testnode +shellinabox = $${rootdirectory:srv}/shellinabox +ca-dir = $${rootdirectory:srv}/ca [slap-parameter] node-quantity = 1 diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index d70b874a1..a4fa42453 100644 --- a/software/erp5testnode/software.cfg +++ b/software/erp5testnode/software.cfg @@ -79,7 +79,7 @@ recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-default.cfg output = ${buildout:directory}/template-default.cfg mode = 0644 -md5sum = d3e590a476b436e54f272303bdbea23a +md5sum = 9881aa4e567732e1c682dbe49c8f62df [networkcache] # signature certificates of the following uploaders. -- 2.30.9