From 4a4937e0b19cf17fd2ce0991c7b50e48c0ac430e Mon Sep 17 00:00:00 2001
From: bigbes <bigbes@gmail.com>
Date: Mon, 1 Sep 2014 11:52:06 -0400
Subject: [PATCH] Cosmetical fixes (custom_proc_title -> instance, mkdir
inst.available)
---
cmake/systemd.cmake | 1 +
extra/dist/dist.lua | 1 +
extra/rpm/tarantool.rpm.spec.in | 3 ++-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
index f59b1b70ce..80c373f0c5 100644
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -14,6 +14,7 @@ if (PKG_CONFIG_FOUND)
endif()
if (SYSTEMD_FOUND)
+ set(WITH_SYSTEMD "ON")
message(STATUS "SYSTEMD_SERVICES_INSTALL_DIR: ${SYSTEMD_SERVICES_INSTALL_DIR}")
else()
set(WITH_SYSTEMD "OFF")
diff --git a/extra/dist/dist.lua b/extra/dist/dist.lua
index 5064686764..e51f5ccbd7 100755
--- a/extra/dist/dist.lua
+++ b/extra/dist/dist.lua
@@ -125,6 +125,7 @@ local force_cfg = {
username = cfg.USERNAME,
logger = fio.pathjoin(cfg.LOGS, instance .. '.log'),
background = true,
+ custom_proc_title = instance
}
diff --git a/extra/rpm/tarantool.rpm.spec.in b/extra/rpm/tarantool.rpm.spec.in
index 81b3eba806..307ed14f1e 100644
--- a/extra/rpm/tarantool.rpm.spec.in
+++ b/extra/rpm/tarantool.rpm.spec.in
@@ -218,6 +218,8 @@ mkdir -m 0755 -p %{_var}/lib/tarantool/
chown tarantool:tarantool %{_var}/lib/tarantool/
mkdir -m 0755 -p %{_sysconfdir}/tarantool/instances.enabled/
chown tarantool:tarantool %{_sysconfdir}/tarantool/instances.enabled/
+mkdir -m 0755 -p %{_sysconfdir}/tarantool/instances.available/
+chown tarantool:tarantool %{_sysconfdir}/tarantool/instances.available/
%if %{with systemd}
%systemd_post tarantool.service
%else
@@ -286,7 +288,6 @@ chkconfig --del tarantool
%files dev
%defattr(-,root,root,-)
%dir "%{_includedir}/tarantool"
-%dir "%{_includedir}/tarantool"
"%{_includedir}/tarantool/config.h"
"%{_includedir}/tarantool/lauxlib.h"
"%{_includedir}/tarantool/luaconf.h"
--
GitLab