Commit 980879f6 authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Julien Muchembled

erp5: Explicitly reference certificate-authority.

Otherwise it's never evaluated, and in turn binary-link is not when unit
tests are disabled.
Also, follow surrounding coding style.
parent 88df1be5
......@@ -284,7 +284,7 @@ md5sum = 4d2207931975e580d04d0b0506034564
[template-zope]
< = download-base
filename = instance-zope.cfg.in
md5sum = a3d1f6298d132426a9752935bb91d4af
md5sum = 7c0e86adda18798f0041af5c8fa72312
link-binary =
${coreutils:location}/bin/basename
${coreutils:location}/bin/cat
......
......@@ -86,7 +86,7 @@ ca-certs = ${directory:certs}
ca-newcerts = ${directory:newcerts}
ca-crl = ${directory:crl}
[certificate-authority]
[{{ section('certificate-authority') }}]
< = certificate-authority-common
recipe = slapos.cookbook:certificate_authority
openssl-binary = ${binary-link:target-directory}/openssl
......@@ -240,8 +240,8 @@ longrequest-logger-timeout =
longrequest-logger-interval =
{% else -%}
longrequest-logger-file = {{ longrequest_logger_base_path ~ name ~ ".log" }}
longrequest-logger-timeout = {{longrequest_logger_timeout}}
longrequest-logger-interval = {{longrequest_logger_interval}}
longrequest-logger-timeout = {{ longrequest_logger_timeout }}
longrequest-logger-interval = {{ longrequest_logger_interval }}
{% endif -%}
wrapper = ${directory:services}/{{ name }}
configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }}
......
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