From 756c70eb2e5b3b741b40b4c8d740a9362c6010cb Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Mon, 22 May 2017 16:23:11 +0900 Subject: [PATCH] stack.erp5: Reuse existing jinja2 base section in mariadb instance --- stack/erp5/buildout.hash.cfg | 2 +- stack/erp5/instance-mariadb.cfg.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index e580ca599..e82ac7f4a 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -19,7 +19,7 @@ md5sum = af0ef3e5e3ca0a2671e5eb65eb3faea6 [template-mariadb] filename = instance-mariadb.cfg.in -md5sum = a99a56d0746303aecce5bbbcf2330dad +md5sum = 9ada4abfc0177ea9e315636ac5621e49 [template-kumofs] filename = instance-kumofs.cfg.in diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index 7a1e0bacb..bb06dcc26 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/stack/erp5/instance-mariadb.cfg.in @@ -248,8 +248,7 @@ run = ${:var}/run [resiliency-exclude-file] # Generate rdiff exclude file in case of resiliency -recipe = slapos.recipe.template:jinja2 -mode = 644 +< = jinja2-template-base template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n" }}' }} rendered = ${directory:srv}/exporter.exclude -- 2.30.9