Remove trailing /

software/erp5/instance-cloudooo.cfg

@@ -38,7 +38,7 @@ ooo-uno-path = ${libreoffice-bin:location}/basis-link/program
 # rest of parts are candidates for some generic stuff
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run/
+services = $${rootdirectory:etc}/run
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -46,5 +46,5 @@ cloudooo-data = $${rootdirectory:srv}/cloudooo
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-srv = $${buildout:directory}/srv/
+etc = $${buildout:directory}/etc
+srv = $${buildout:directory}/srv

software/erp5/instance-erp5-production.cfg

@@ -64,8 +64,8 @@ software-type = tidstorage
 # 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

software/erp5/instance-kumofs.cfg

@@ -67,27 +67,27 @@ state-file = $${rootdirectory:srv}/logrotate.status
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log/
-services = $${rootdirectory:etc}/run/
-run = $${rootdirectory:var}/run/
+log = $${rootdirectory:var}/log
+services = $${rootdirectory:etc}/run
+run = $${rootdirectory:var}/run
 backup = $${rootdirectory:srv}/backup
 
 [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
 kumofs-data = $${rootdirectory:srv}/kumofs
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
 
 [cron]
 recipe = slapos.cookbook:cron

software/erp5/instance-mariadb.cfg

@@ -129,28 +129,28 @@ link-binary =
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-var = $${buildout:directory}/var/
-srv = $${buildout:directory}/srv/
-bin = $${buildout:directory}/bin/
+etc = $${buildout:directory}/etc
+var = $${buildout:directory}/var
+srv = $${buildout:directory}/srv
+bin = $${buildout:directory}/bin
 
 [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
-cron-entries = $${rootdirectory:etc}/cron.d/
-crontabs = $${rootdirectory:etc}/crontabs/
-cronstamps = $${rootdirectory:etc}/cronstamps/
-cronoutput = $${basedirectory:log}/cron/
-ca-dir = $${rootdirectory:srv}/ssl/
-mariadb-backup-full = $${basedirectory:backup}/mariadb-full/
-mariadb-backup-incremental = $${basedirectory:backup}/mariadb-incremental/
-mariadb-data = $${rootdirectory:srv}/mariadb/
-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
+ca-dir = $${rootdirectory:srv}/ssl
+mariadb-backup-full = $${basedirectory:backup}/mariadb-full
+mariadb-backup-incremental = $${basedirectory:backup}/mariadb-incremental
+mariadb-data = $${rootdirectory:srv}/mariadb
+logrotate-backup = $${basedirectory:backup}/logrotate
+logrotate-entries = $${rootdirectory:etc}/logrotate.d
 

software/erp5/instance-memcached.cfg

@@ -16,12 +16,12 @@ offline = true
 
 [rootdirectory]
 recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc/
-bin = $${buildout:directory}/bin/
+etc = $${buildout:directory}/etc
+bin = $${buildout:directory}/bin
 
 [basedirectory]
 recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run/
+services = $${rootdirectory:etc}/run
 
 [memcached-instance]
 recipe = slapos.cookbook:generic.memcached

software/erp5/instance-zope.cfg

@@ -152,31 +152,31 @@ 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
-zodb = $${rootdirectory:srv}/zodb/
-instance = $${rootdirectory:srv}/erp5shared/
+zodb = $${rootdirectory:srv}/zodb
+instance = $${rootdirectory:srv}/erp5shared
 instance-etc = $${:instance}/etc
 apache-conf = $${rootdirectory:etc}/apache
 instance-etc-package-include = $${:instance}/etc/package-include
@@ -189,10 +189,10 @@ instance-constraint = $${:instance}/Constraint
 instance-import = $${:instance}/import
 instance-lib = $${:instance}/lib
 instance-tests = $${:instance}/tests
-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/
+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

software/erp5/software.cfg

@@ -23,28 +23,28 @@ unzip = true
 [template-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 4abee8c56d98f10e16d1909ca47ed3a8
+md5sum = 180f9dc94ae5a2d9e03a13f191905938
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
 [template-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-zope.cfg
-md5sum = 3b5ba87a44f172c8afc14ed57736949f
+md5sum = 090a7923d7d7e1d05f41679bab8042e9
 output = ${buildout:directory}/template-zope.cfg
 mode = 0644
 
 [template-cloudooo]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-cloudooo.cfg
-md5sum = d767af728c419d9173048b851df10b46
+md5sum = 55fb694f0fb6193156b7d26ff40882a9
 output = ${buildout:directory}/template-cloudooo.cfg
 mode = 0644
 
 [template-kumofs]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-kumofs.cfg
-md5sum = 9ba8a7f8eb67c51979b38602bb6610b8
+md5sum = c12d8dc1925d16a75247971086734aa8
 output = ${buildout:directory}/template-kumofs.cfg
 mode = 0644
 
@@ -58,14 +58,14 @@ mode = 0644
 [template-memcached]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-memcached.cfg
-md5sum = 065693aa7d43ab91edfe2f3f70707005
+md5sum = 9a1462f3e34b99f384ae47b48a3a733c
 output = ${buildout:directory}/template-memcached.cfg
 mode = 0644
 
 [template-erp5-production]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-erp5-production.cfg
-md5sum = 363f08ba40344e2704f7f474364f42d8
+md5sum = a29bd346eebd6a6c659bc1a3a3bdf0e1
 output = ${buildout:directory}/template-erp5-production.cfg
 mode = 0644