diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake index f59b1b70ce7c5ae1afc08f0b7d0076f1fac7dc5c..80c373f0c573cd7eb969414d9dc57760ca011360 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 5064686764a969a1ae2122f6b1daf7a57f9af893..e51f5ccbd7d1261d3768fff0d118ef1b6d32a821 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 81b3eba80617f0ebcdebccb13b8a3fd4cfae00e6..307ed14f1e517e27f3e5dc9136bba65e014aa7b1 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"