Commit 30e24286 authored by Łukasz Nowak's avatar Łukasz Nowak

Workaround slapos.recipe.template bug.

Keys are becoming lowercased.
parent 979329f7
...@@ -121,7 +121,7 @@ class Recipe(GenericBaseRecipe): ...@@ -121,7 +121,7 @@ class Recipe(GenericBaseRecipe):
if product: if product:
prefixed_products.append('products %s' % product) prefixed_products.append('products %s' % product)
prefixed_products.insert(0, 'products %s' % self.options[ prefixed_products.insert(0, 'products %s' % self.options[
'instance-Products']) 'instance-products'])
zope_config['products'] = '\n'.join(prefixed_products) zope_config['products'] = '\n'.join(prefixed_products)
zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port']) zope_config['address'] = '%s:%s' % (self.options['ip'], self.options['port'])
......
...@@ -34,7 +34,7 @@ deadlock-path = /manage_debug_threads ...@@ -34,7 +34,7 @@ deadlock-path = /manage_debug_threads
wrapper = $${basedirectory:services}/zope_development wrapper = $${basedirectory:services}/zope_development
instance-path = $${directory:instance} instance-path = $${directory:instance}
instance-etc = $${directory:instance-etc} instance-etc = $${directory:instance-etc}
instance-Products = $${directory:instance-Products} instance-products = $${directory:instance-products}
tmp-path = $${rootdirectory:tmp} tmp-path = $${rootdirectory:tmp}
bin-path = $${rootdirectory:bin} bin-path = $${rootdirectory:bin}
site-zcml = $${:instance-etc}/site.zcml site-zcml = $${:instance-etc}/site.zcml
...@@ -115,11 +115,12 @@ zodb = $${rootdirectory:srv}/zodb/ ...@@ -115,11 +115,12 @@ zodb = $${rootdirectory:srv}/zodb/
instance = $${rootdirectory:srv}/erp5shared/ instance = $${rootdirectory:srv}/erp5shared/
instance-etc = $${:instance}/etc instance-etc = $${:instance}/etc
instance-etc-package-include = $${:instance}/etc/package-include instance-etc-package-include = $${:instance}/etc/package-include
instance-Document = $${:instance}/Document # because of bug in slapos.recipe.template keys are lowercased
instance-PropertySheet = $${:instance}/PropertySheet instance-document = $${:instance}/Document
instance-Products = $${:instance}/Products instance-propertysheet = $${:instance}/PropertySheet
instance-Extensions = $${:instance}/Extensions instance-products = $${:instance}/Products
instance-Constraint = $${:instance}/Constraint instance-extensions = $${:instance}/Extensions
instance-constraint = $${:instance}/Constraint
instance-import = $${:instance}/import instance-import = $${:instance}/import
instance-lib = $${:instance}/lib instance-lib = $${:instance}/lib
instance-tests = $${:instance}/tests instance-tests = $${:instance}/tests
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment