Commit e2f67bcd authored by Vincent Pelletier's avatar Vincent Pelletier

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
parent b9bde279
[buildout] [buildout]
parts = parts =
rootdirectory
instance instance
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
...@@ -20,10 +19,7 @@ path_file = $${rootdirectory:srv}/path.cfg ...@@ -20,10 +19,7 @@ path_file = $${rootdirectory:srv}/path.cfg
[rootdirectory] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc run = $${buildout:directory}/etc/run
run = $${rootdirectory:etc}/run agentlog = $${buildout:log}/var/log/agent
var = $${buildout:directory}/var
log = $${rootdirectory:var}/log
agentlog = $${rootdirectory:log}/agent
srv = $${buildout:directory}/srv srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin bin = $${buildout:directory}/bin
...@@ -26,7 +26,7 @@ eggs = ${instance-recipe:egg} ...@@ -26,7 +26,7 @@ eggs = ${instance-recipe:egg}
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
md5sum = 37b8a63db625fc9a205a0fde90797c74 md5sum = 361004653bd343fe06766eef82958ccd
mode = 0644 mode = 0644
[eggs] [eggs]
......
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