From f465195c3f6bc41618cc591679c36334f4e89cb5 Mon Sep 17 00:00:00 2001 From: Alain Takoudjou <talino@tiolive.com> Date: Thu, 16 Oct 2014 13:32:37 +0000 Subject: [PATCH] Set openssl location --- stack/erp5/buildout.cfg | 2 +- stack/erp5/instance.cfg.in | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index aefede8c5..b958bb8ca 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -224,7 +224,7 @@ md5sum = e40e2e39f4941c6372f4357e8589a5cf # XXX: "template.cfg" is hardcoded in instanciation recipe filename = template.cfg template = ${:_profile_base_location_}/instance.cfg.in -md5sum = c57404cdbbce6b37554719a894f9a88d +#md5sum = extra-context = key mariadb_link_binary template-mariadb:link-binary key zope_link_binary template-zope:link-binary diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in index 3cb48d7e2..9b7635bc0 100644 --- a/stack/erp5/instance.cfg.in +++ b/stack/erp5/instance.cfg.in @@ -72,6 +72,19 @@ extensions = jinja2.ext.do extra-context = key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository import urlparse urlparse + key openssl_location :openssl-location +# Must match the key id in [switch-softwaretype] which uses this section. + key software_type :software-type +software-type = default +openssl-location = {{ openssl_location }} + +[dynamic-template-erp5-RootSoftwareInstance] +< = dynamic-template-erp5 +software-type = RootSoftwareInstance + +[dynamic-template-erp5-create-erp5-site] +< = dynamic-template-erp5 +software-type = create-erp5-site [dynamic-template-balancer-parameters] apache = {{ apache_location }} -- 2.30.9