From 4d67cbe31bc338c7d5389a376e78aef57e50de9d Mon Sep 17 00:00:00 2001
From: Veniamin Gvozdikov <vgvozdikov@tarantool.org>
Date: Tue, 7 Jul 2015 13:18:33 +0300
Subject: [PATCH] Added set up path for tarantool datadir
---
extra/dist/CMakeLists.txt | 6 ++++++
extra/dist/default/tarantool.in | 6 +++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/extra/dist/CMakeLists.txt b/extra/dist/CMakeLists.txt
index c90b27ceec..23948b4ada 100644
--- a/extra/dist/CMakeLists.txt
+++ b/extra/dist/CMakeLists.txt
@@ -1,5 +1,11 @@
# Scripts for a tarantoolctl packaging
set(SYSV_INITD_PATH ${CMAKE_INSTALL_LIBDIR}/tarantool/tarantool.init)
+# Default path to data in default/tarantool
+if (NOT TARANTOOL_DATADIR)
+ set(TARANTOOL_DATADIR "/var/lib/tarantool")
+endif()
+message (STATUS "TARANTOOL_DATADIR: ${TARANTOOL_DATADIR}")
+
configure_file("tarantool.service.in" "tarantool.service")
configure_file(default/tarantool.in default/tarantool)
diff --git a/extra/dist/default/tarantool.in b/extra/dist/default/tarantool.in
index 8248c4f5db..a222008849 100644
--- a/extra/dist/default/tarantool.in
+++ b/extra/dist/default/tarantool.in
@@ -1,9 +1,9 @@
-- Options for Tarantool
default_cfg = {
pid_file = "/var/run/tarantool", -- will become pid_file .. instance .. '.pid'
- wal_dir = "/var/lib/tarantool", -- will become wal_dir/instance/
- snap_dir = "/var/lib/tarantool", -- snap_dir/instance/
- sophia_dir = "/var/lib/tarantool", -- will become sophia_dir/sophia/instance/
+ wal_dir = "@TARANTOOL_DATADIR@", -- will become wal_dir/instance/
+ snap_dir = "@TARANTOOL_DATADIR@", -- snap_dir/instance/
+ sophia_dir = "@TARANTOOL_DATADIR@", -- will become sophia_dir/sophia/instance/
logger = "/var/log/tarantool", -- logger/instance .. '.log'
username = "tarantool",
}
--
GitLab