diff --git a/software/erp5/instance-zope.cfg b/software/erp5/instance-zope.cfg index b05657ddeb0a7ba54bd36e11108d7e071aba5b97..dc2fbd32e0742a658f112b2285d7b628f65f5907 100644 --- a/software/erp5/instance-zope.cfg +++ b/software/erp5/instance-zope.cfg @@ -21,9 +21,9 @@ offline = true access-control-string = none [publish-apache-zope-backend-connection-string] -recipe = slapos.cookbook:publishurl +recipe = slapos.cookbook:publish url = https://$${zope-instance:user}:$${zope-instance:password}@[$${apache-zope-backend-instance:ip}]:$${apache-zope-backend-instance:port} -deadlock-url = $${:url}/$${zope-instance:deadlock-path}?$${zope-instance:deadlock-password} +url-deadlock = $${:url}/$${zope-instance:deadlock-path}?$${zope-instance:deadlock-password} [apache-zope-backend-instance] recipe = slapos.cookbook:apache.zope.backend diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index b053e72ac84f117092d816b0659ebd9f86f8e1b4..a3e9d5cde1644a63d707ab893ab4ff69d03a0c01 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -32,7 +32,7 @@ mode = 0644 [template-zope] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-zope.cfg -md5sum = 9a4f6e8ca5731534049d2b99d60da8ae +md5sum = 6c3e0a56cd152eba4e2d1bdd8086e6d4 output = ${buildout:directory}/template-zope.cfg mode = 0644