From 615342494f6abad5be75f99e1a6c15b5e242c11e Mon Sep 17 00:00:00 2001
From: Tatuya Kamada <tatuya@nexedi.com>
Date: Fri, 9 Nov 2018 17:17:55 +0900
Subject: [PATCH] erp5: Parametarise mariadb data-directory
---
stack/erp5/buildout.hash.cfg | 2 +-
stack/erp5/instance-mariadb.cfg.in | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg
index 1192f4094..9d44c516a 100644
--- a/stack/erp5/buildout.hash.cfg
+++ b/stack/erp5/buildout.hash.cfg
@@ -26,7 +26,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
[template-mariadb]
filename = instance-mariadb.cfg.in
-md5sum = f59c9c313147e437637c2c5ef00438d0
+md5sum = 4434c0aef147805e7340004eaac735a7
[template-kumofs]
filename = instance-kumofs.cfg.in
diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in
index b05aabd7e..4c03b1f0e 100644
--- a/stack/erp5/instance-mariadb.cfg.in
+++ b/stack/erp5/instance-mariadb.cfg.in
@@ -126,7 +126,8 @@ command = {{ parameter_dict['findutils-location'] }}/bin/find "${directory:maria
ip = {{ ip }}
port = {{ port }}
socket = ${directory:run}/mariadb.sock
-data-directory = ${directory:mariadb-data}
+{% set data_directory = slapparameter_dict.get('data-directory', '${directory:mariadb-data}') -%}
+data-directory = {{ data_directory }}
tmp-directory = ${directory:tmp}
etc-directory = ${directory:etc}
pid-file = ${directory:run}/mariadb.pid
--
2.30.9