Prevent having duplicated /

software/erp5/instance-erp5-development.cfg

@@ -53,11 +53,11 @@ ca-crl = $${test-cadirectory:crl}
 
 [test-cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:test-ca-dir}/requests/
-private = $${directory:test-ca-dir}/private/
-certs = $${directory:test-ca-dir}/certs/
-newcerts = $${directory:test-ca-dir}/newcerts/
-crl = $${directory:test-ca-dir}/crl/
+requests = $${directory:test-ca-dir}/requests
+private = $${directory:test-ca-dir}/private
+certs = $${directory:test-ca-dir}/certs
+newcerts = $${directory:test-ca-dir}/newcerts
+crl = $${directory:test-ca-dir}/crl
 
 [erp5-update]
 recipe = slapos.cookbook:erp5.update
@@ -118,11 +118,11 @@ software-type = kumofs
 # rest of parts are candidates for some generic stuff
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run/
+services = $${rootdirectory:etc}/run
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
+etc = $${buildout:directory}/etc
 
 [directory]
 test-ca-dir = $${rootdirectory:srv}/test-ca/

software/erp5/instance-zope.cfg

@@ -234,11 +234,11 @@ ca-crl = $${erp5-cadirectory:crl}
 
 [erp5-cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:erp5-ca-dir}/requests/
-private = $${directory:erp5-ca-dir}/private/
-certs = $${directory:erp5-ca-dir}/certs/
-newcerts = $${directory:erp5-ca-dir}/newcerts/
-crl = $${directory:erp5-ca-dir}/crl/
+requests = $${directory:erp5-ca-dir}/requests
+private = $${directory:erp5-ca-dir}/private
+certs = $${directory:erp5-ca-dir}/certs
+newcerts = $${directory:erp5-ca-dir}/newcerts
+crl = $${directory:erp5-ca-dir}/crl
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -256,7 +256,7 @@ instance-constraint = $${:instance}/Constraint
 instance-import = $${:instance}/import
 instance-lib = $${:instance}/lib
 instance-tests = $${:instance}/tests
-erp5-ca-dir = $${rootdirectory:srv}/erp5-ca/
+erp5-ca-dir = $${rootdirectory:srv}/erp5-ca
 ca-dir = $${rootdirectory:srv}/ssl
 cron-entries = $${rootdirectory:etc}/cron.d
 crontabs = $${rootdirectory:etc}/crontabs

software/erp5/snippet-master.cfg

@@ -60,12 +60,12 @@ post = ${buildout:bin-directory}/killpidfromfile $${tidstorage:pidfile-name} SIG
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cronoutput = $${basedirectory:log}/cron/
-logrotate-backup = $${basedirectory:backup}/logrotate/
-logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
+cronoutput = $${basedirectory:log}/cron
+logrotate-backup = $${basedirectory:backup}/logrotate
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
 
 [cron]
 recipe = slapos.cookbook:cron
@@ -121,11 +121,11 @@ ca-crl = $${erp5-cadirectory:crl}
 
 [erp5-cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:erp5-ca-dir}/requests/
-private = $${directory:erp5-ca-dir}/private/
-certs = $${directory:erp5-ca-dir}/certs/
-newcerts = $${directory:erp5-ca-dir}/newcerts/
-crl = $${directory:erp5-ca-dir}/crl/
+requests = $${directory:erp5-ca-dir}/requests
+private = $${directory:erp5-ca-dir}/private
+certs = $${directory:erp5-ca-dir}/certs
+newcerts = $${directory:erp5-ca-dir}/newcerts
+crl = $${directory:erp5-ca-dir}/crl
 
 [certificate-authority]
 recipe = slapos.cookbook:certificate_authority
@@ -140,33 +140,33 @@ ca-crl = $${cadirectory:crl}
 
 [cadirectory]
 recipe = slapos.cookbook:mkdirectory
-requests = $${directory:ca-dir}/requests/
-private = $${directory:ca-dir}/private/
-certs = $${directory:ca-dir}/certs/
-newcerts = $${directory:ca-dir}/newcerts/
-crl = $${directory:ca-dir}/crl/
+requests = $${directory:ca-dir}/requests
+private = $${directory:ca-dir}/private
+certs = $${directory:ca-dir}/certs
+newcerts = $${directory:ca-dir}/newcerts
+crl = $${directory:ca-dir}/crl
 
 [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/
-backup = $${rootdirectory:srv}/backup/
+log = $${rootdirectory:var}/log
+services = $${rootdirectory:etc}/run
+run = $${rootdirectory:var}/run
+backup = $${rootdirectory:srv}/backup
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
-tidstorage = $${rootdirectory:srv}/tidstorage/
-zodb = $${rootdirectory:srv}/zodb/
+tidstorage = $${rootdirectory:srv}/tidstorage
+zodb = $${rootdirectory:srv}/zodb
 zodb-backup = $${basedirectory:backup}/zodb
-instance = $${rootdirectory:srv}/erp5shared/
+instance = $${rootdirectory:srv}/erp5shared
 instance-etc = $${:instance}/etc
 apache-conf = $${rootdirectory:etc}/apache
 instance-etc-package-include = $${:instance}/etc/package-include
@@ -179,14 +179,14 @@ instance-constraint = $${:instance}/Constraint
 instance-import = $${:instance}/import
 instance-lib = $${:instance}/lib
 instance-tests = $${:instance}/tests
-erp5-ca-dir = $${rootdirectory:srv}/erp5-ssl/
-ca-dir = $${rootdirectory:srv}/ssl/
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cronoutput = $${basedirectory:log}/cron/
-logrotate-backup = $${basedirectory:backup}/logrotate/
-logrotate-entries = $${rootdirectory:etc}/logrotate.d/
+erp5-ca-dir = $${rootdirectory:srv}/erp5-ssl
+ca-dir = $${rootdirectory:srv}/ssl
+cron-entries = $${rootdirectory:etc}/cron.d
+crontabs = $${rootdirectory:etc}/crontabs
+cronstamps = $${rootdirectory:etc}/cronstamps
+cronoutput = $${basedirectory:log}/cron
+logrotate-backup = $${basedirectory:backup}/logrotate
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
 
 [binary-link]
 recipe = slapos.cookbook:symbolic.link

software/erp5/software.cfg

@@ -76,7 +76,7 @@ mode = 0644
 [template-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = ff93a87778520a3c7ce0d7bda93e25cc
+md5sum = 1a91f753dc001f5f77d0e8372eb7a531
 output = ${buildout:directory}/template-zope.cfg
 mode = 0644
 
@@ -118,7 +118,7 @@ mode = 0644
 [template-erp5-development]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-erp5-development.cfg
-md5sum = 0d7b98e8beccb7d9d87827504d96ac54
+md5sum = 722060b6b8daed9bfb7df0c1109b976c
 output = ${buildout:directory}/template-erp5-development.cfg
 mode = 0644
 
@@ -139,7 +139,7 @@ mode = 0644
 [template-snippet-master]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-master.cfg
-md5sum = 9d9dda89215374b8122107585807ee8b
+md5sum = 4d984d767e30dd7b8a333d35eca03eb7
 output = ${buildout:directory}/template-snippet-master.cfg
 mode = 0644