Break convention.

In order to simplify generation, do not care yet about -instance suffix.

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_id)s-instance]
+[%(zope_id)s]
 recipe = slapos.cookbook:generic.zope
 
 # XXX: products won't be needed as soon as all ERP5 (and products-deps)
@@ -59,10 +59,10 @@ runzope-binary = ${buildout:bin-directory}/runzope
 <= logrotate
 recipe = slapos.cookbook:logrotate.d
 name = zope
-log = $${%(zope_id)s-instance:event-log} $${%(zope_id)s-instances:z2-log}
+log = $${%(zope_id)s:event-log} $${%(zope_id)ss:z2-log}
 frequency = daily
 rotate-num = 30
-post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s-instance:pid-file} SIGUSR2
+post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s: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 = 8632c36a2dbed8bbabe123bfd2033b8a
+md5sum = 339b5ebe70c48b17f7c3db7ec0240bfa
 output = ${buildout:directory}/template-snippet-zope.cfg
 mode = 0644