Start to fill template keys for zope (WIP)

software/erp5/snippet-zope.cfg

@@ -22,7 +22,7 @@ cert-file = $${apache-zope-backend-instance:cert-file}
 executable = $${apache-zope-backend-instance:wrapper}
 wrapper = $${basedirectory:services}/apache
 
-[zope-instance]
+[%(zope_id)s-instance]
 recipe = slapos.cookbook:generic.zope
 
 # XXX: products won't be needed as soon as all ERP5 (and products-deps)
@@ -32,15 +32,13 @@ products = ${products:list}
 
 # Options
 user = zope
-port = 12001
+port = %(zope_port)s
 ip = $${slap-network-information:local-ipv4}
-zodb-cache-size = 5000
-thread-amount = 4
-zodb-path = $${directory:zodb}/main.cfg
+thread-amount = %(zope_thread_amount)s
 deadlock-path = /manage_debug_threads
 
 # Paths
-wrapper = $${basedirectory:services}/zope_development
+wrapper = $${basedirectory:services}/%(zope_id)s
 instance-path = $${directory:instance}
 instance-etc = $${directory:instance-etc}
 instance-products = $${directory:instance-products}
@@ -48,24 +46,23 @@ bt5-repository = $${rootdirectory:var}/bt5_repository
 tmp-path = $${rootdirectory:tmp}
 bin-path = $${rootdirectory:bin}
 site-zcml = $${:instance-etc}/site.zcml
-logrotate-post = $${rootdirectory:bin}/zope-post-logrotate
-pid-file = $${basedirectory:run}/zope.pid
-lock-file = $${basedirectory:run}/zope.lock
-event-log = $${basedirectory:log}/zope-event.log
-z2-log = $${basedirectory:log}/zope-Z2.log
-configuration-file = $${rootdirectory:etc}/zope.conf
+pid-file = $${basedirectory:run}/%(zope_id)s.pid
+lock-file = $${basedirectory:run}/%(zope_id)s.lock
+event-log = $${basedirectory:log}/%(zope_id)s-event.log
+z2-log = $${basedirectory:log}/%(zope_id)s-Z2.log
+configuration-file = $${rootdirectory:etc}/%(zope_id)s.conf
 inituser = $${:instance-path}/inituser
 # Binary information
 runzope-binary = ${buildout:bin-directory}/runzope
 
-[logrotate-entry-zope]
+[logrotate-entry-%(zope_id)s]
 <= logrotate
 recipe = slapos.cookbook:logrotate.d
 name = zope
-log = $${zope-instance:event-log} $${zope-instance:z2-log}
+log = $${%(zope_id)s-instance:event-log} $${%(zope_id)s-instances:z2-log}
 frequency = daily
 rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${zope-instance:pid-file} SIGUSR2
+post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s-instance:pid-file} SIGUSR2
 sharedscripts = true
 notifempty = true
 create = true

software/erp5/software.cfg

@@ -103,7 +103,7 @@ mode = 0644
 [template-snippet-zope]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/snippet-zope.cfg
-md5sum = 16f8a2ed832e45515f1917c189a00802
+md5sum = 8632c36a2dbed8bbabe123bfd2033b8a
 output = ${buildout:directory}/template-snippet-zope.cfg
 mode = 0644