From e2f67bcdc6485acce66be6bef41706f04c85cf5c Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Fri, 1 Jun 2012 09:42:10 +0200 Subject: [PATCH] Simplify agent's instance.cfg. - rootdirectory section is implicitely pulled by instance section, so do not name it in parts. - merge rootdirectory entries, as mkdirectory created intermediate directories implicitly and those entries were not used --- software/agent/instance.cfg | 8 ++------ software/agent/software.cfg | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/software/agent/instance.cfg b/software/agent/instance.cfg index 0e083f130..4486e53a2 100644 --- a/software/agent/instance.cfg +++ b/software/agent/instance.cfg @@ -1,6 +1,5 @@ [buildout] parts = - rootdirectory instance eggs-directory = ${buildout:eggs-directory} @@ -20,10 +19,7 @@ path_file = $${rootdirectory:srv}/path.cfg [rootdirectory] recipe = slapos.cookbook:mkdirectory -etc = $${buildout:directory}/etc -run = $${rootdirectory:etc}/run -var = $${buildout:directory}/var -log = $${rootdirectory:var}/log -agentlog = $${rootdirectory:log}/agent +run = $${buildout:directory}/etc/run +agentlog = $${buildout:log}/var/log/agent srv = $${buildout:directory}/srv bin = $${buildout:directory}/bin diff --git a/software/agent/software.cfg b/software/agent/software.cfg index ab63fec2b..e551d9e7d 100644 --- a/software/agent/software.cfg +++ b/software/agent/software.cfg @@ -26,7 +26,7 @@ eggs = ${instance-recipe:egg} recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg output = ${buildout:directory}/template.cfg -md5sum = 37b8a63db625fc9a205a0fde90797c74 +md5sum = 361004653bd343fe06766eef82958ccd mode = 0644 [eggs] -- 2.30.9