From 0dce69910f092781ba12679a2bdbf9521e5a8ff8 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Mon, 14 Apr 2014 20:49:01 +0200 Subject: [PATCH] erp5.zope: Simplify zope recipe parameters. Remove non-needed parameters, empty unused parameter. Move "inituser" closer to "user" and "password", as they are related. --- stack/erp5/buildout.cfg | 2 +- stack/erp5/instance-zope.cfg.in | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index bb678527a..1e559910a 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -310,7 +310,7 @@ md5sum = 7bbb690cb2ea38cd2aa84c8a79c50399 [template-zope] < = download-base filename = instance-zope.cfg.in -md5sum = a30c105d4059f29dd36b09ab276fbd5e +md5sum = 19e0e41fa4b2674a67f2cfb2562524c8 link-binary = ${aspell:location}/bin/aspell ${coreutils:location}/bin/basename diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in index e5001452d..a21280c25 100644 --- a/stack/erp5/instance-zope.cfg.in +++ b/stack/erp5/instance-zope.cfg.in @@ -165,20 +165,15 @@ ipv4-port = [zope-base] recipe = slapos.cookbook:generic.zope.zeo.client +inituser = ${directory:instance}/inituser user = {{ dumps(slapparameter_dict['inituser-login']) }} password = {{ dumps(slapparameter_dict['inituser-password']) }} -ip = {{ ipv4 }} timezone = {{ dumps(slapparameter_dict['timezone']) }} -tidstorage-ip = ${tidstorage:ipv4} -tidstorage-port = ${tidstorage:ipv4-port} -instance-etc = ${directory:instance-etc} -bt5-repository = ${directory:var}/bt5_repository tmp-path = ${directory:tmp} bin-path = ${directory:bin} -site-zcml = ${:instance-etc}/site.zcml -inituser = ${directory:instance}/inituser +site-zcml = ${directory:instance-etc}/site.zcml runzope-binary = {{ bin_directory }}/runzope -bt5-repository-list = +bt5-repository = [zope-conf-parameter-base] ip = {{ ipv4 }} @@ -240,7 +235,7 @@ rendered = ${directory:etc}/{{ name }}.conf context = section parameter_dict {{ conf_parameter_name }} -[{{ name }}] +[{{ section(name) }}] < = zope-base {% if longrequest_logger_interval < 0 -%} longrequest-logger-file = @@ -253,12 +248,11 @@ longrequest-logger-interval = {{ longrequest_logger_interval }} {% endif -%} wrapper = ${directory:services}/{{ name }} configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }} -port = {{ '${' ~ conf_parameter_name ~ ':port}' }} [{{ section("promise-" ~ name) }}] recipe = slapos.cookbook:check_port_listening -hostname = {{ '${' ~ name ~ ':ip}' }} -port = {{ '${' ~ name ~ ':port}' }} +hostname = {{ ipv4 }} +port = {{ port }} path = ${directory:promises}/{{ name }} {% if use_ipv6 -%} -- 2.30.9