Merge both mkdirectory sections.

34cc2316 · Vincent Pelletier · 5962ee8d · 34cc2316 · 34cc2316
Commit 34cc2316 authored May 29, 2012 by Vincent Pelletier
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

software/erp5/instance-erp5-production.cfg.in software/erp5/instance-erp5-production.cfg.in +1 -6

software/erp5/software.cfg software/erp5/software.cfg +1 -1

No files found.
--- a/software/erp5/instance-erp5-production.cfg.in
+++ b/software/erp5/instance-erp5-production.cfg.in
@@ -108,11 +108,6 @@ bt5 = erp5_full_text_myisam_catalog
 bt5-repository-url = {{ local_bt5_repository }}
 smtp-url = smtp://localhost:25/

-# rest of parts are candidates for some generic stuff
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = ${rootdirectory:etc}/run
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = ${buildout:directory}/etc
+etc = ${buildout:directory}/etc/run
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
@@ -205,7 +205,7 @@ mode = 640
 [template-erp5-production]
 < = template-jinja2-base
 filename = instance-erp5-production.cfg
-md5sum = 1b458ff6a9b82f24f29f71b58f559186
+md5sum = ed679c98be0537c21bb34c9a236eeea7
 extra-context =
    key local_bt5_repository local-bt5-repository:list