From bcfb6300fa74bd01f676641520af9b9a0cfa033d Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Fri, 11 Apr 2014 17:44:13 +0400
Subject: [PATCH] rpm specific changes due to tarantool_box renaming.
---
extra/CMakeLists.txt | 2 +-
extra/rpm.spec.in | 24 ++----------------------
extra/{tarantool_box => tarantool} | 10 +++++-----
extra/tarantool_deploy.sh | 20 ++++++++++----------
extra/tarantool_multi.sh | 2 +-
5 files changed, 19 insertions(+), 39 deletions(-)
rename extra/{tarantool_box => tarantool} (93%)
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index b1f48f2dff..089230198c 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -4,7 +4,7 @@
#
if (ENABLE_RPM)
# chmod +x 655
- install (FILES tarantool_box DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
+ install (FILES tarantool DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d
PERMISSIONS
OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE
diff --git a/extra/rpm.spec.in b/extra/rpm.spec.in
index a05cde21c6..1778370db7 100644
--- a/extra/rpm.spec.in
+++ b/extra/rpm.spec.in
@@ -78,21 +78,6 @@ It supports replication, online backup, stored procedures in Lua.
This package provides tarantool lua bindings to the
sophia database.
-# Tarantool client spec
-
-%package client
-Summary: Tarantool command line client with history support
-Vendor: tarantool.org
-Group: Applications/Databases
-Provides: tarantool-client
-Obsoletes: tarantool-client
-%description -n tarantool-client
-Tarantool is a high performance in-memory NoSQL database.
-It supports replication, online backup, stored procedures in Lua.
-
-This package provides a command line client for Tarantool
-with history support.
-
# Tarantool dev spec
%package dev
@@ -124,11 +109,11 @@ This package provides Tarantool client libraries.
%build
# https://fedoraproject.org/wiki/Packaging:RPMMacros
-cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=ON -DENABLE_RPM=ON \
+cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_RPM=ON \
-DENABLE_BACKTRACE=ON -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
-DCMAKE_INSTALL_BINDIR=%{_bindir} \
- -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \
-DCMAKE_INSTALL_SBINDIR=%{_sbindir} \
-DCMAKE_INSTALL_SHAREDSTATEDIR=%{_sharedstatedir} \
@@ -207,11 +192,6 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
"%{_includedir}/tarantool/1.6/luajit.h"
"%{_includedir}/tarantool/1.6/lualib.h"
-%files client
-%defattr(-,root,root,-)
-"%{_mandir}/man1/tarantool.1.gz"
-"%{_bindir}/tarantool"
-
%changelog
* Wed Nov 13 2013 Tarantool Team <support@tarantool.org> 1.0-2
- Temporary disable client for 1.6
diff --git a/extra/tarantool_box b/extra/tarantool
similarity index 93%
rename from extra/tarantool_box
rename to extra/tarantool
index ae855b5043..43b760cfec 100644
--- a/extra/tarantool_box
+++ b/extra/tarantool
@@ -1,17 +1,17 @@
#!/bin/bash
-# /etc/rc.d/init.d/tarantool_box
+# /etc/rc.d/init.d/tarantool
#
# chkconfig: 2345 99 99
-# description: tarantool_box
-# processname: tarantool_box
+# description: tarantool
+# processname: tarantool
. /etc/init.d/functions
RETVAL=0
# If we're running from sysinit, the basename is
# prefixed with a prefix like:
-# /etc/rc3.d/S99tarantool_box1.1 -> ../init.d/tarantool_box1.1
+# /etc/rc3.d/S99tarantool1.1 -> ../init.d/tarantool1.1
# Filter S99 out.
INST=$(basename $0 | sed 's/^[SK][0-9]\{2\}//g')
export PIDFILE="/var/${INST}/box.pid"
@@ -25,7 +25,7 @@ export OPTIONS=""
# If, for some reason, this script is invoked not via
# a symlink, do nothing.
#
-if [ "${INST}" == "tarantool_box" ]
+if [ "${INST}" == "tarantool" ]
then
echo_failure
echo
diff --git a/extra/tarantool_deploy.sh b/extra/tarantool_deploy.sh
index 312ba32620..75be7c2738 100755
--- a/extra/tarantool_deploy.sh
+++ b/extra/tarantool_deploy.sh
@@ -71,7 +71,7 @@ rollback_instance() {
rm -rf $workdir
rm -f $config
rm -f "${prefix}/bin/tarantool$id.sh"
- rm -f "${prefix_etc}/init.d/tarantool_box$id"
+ rm -f "${prefix_etc}/init.d/tarantool$id"
}
rollback() {
@@ -93,8 +93,8 @@ try() {
deploy() {
id=$1
- workdir="${prefix_var}/tarantool_box$id"
- config="${prefix_etc}/tarantool/tarantool_box$id.cfg"
+ workdir="${prefix_var}/tarantool$id"
+ config="${prefix_etc}/tarantool/tarantool$id.cfg"
log ">>> deploy instance $id"
@@ -112,13 +112,13 @@ deploy() {
try 'echo logger = \"cat - \>\> logs/tarantool.log\" >> $config'
# setup wrapper
- try "ln -s \"${prefix}/bin/tarantool_multi.sh\" \"${prefix}/bin/tarantool_box$id.sh\""
+ try "ln -s \"${prefix}/bin/tarantool_multi.sh\" \"${prefix}/bin/tarantool$id.sh\""
# setup startup script
- try "ln -s \"${prefix_etc}/init.d/tarantool_box\" \"${prefix_etc}/init.d/tarantool_box$id\""
+ try "ln -s \"${prefix_etc}/init.d/tarantool\" \"${prefix_etc}/init.d/tarantool$id\""
# register service
- [ -x /sbin/chkconfig ] && try "/sbin/chkconfig --add tarantool_box$id"
+ [ -x /sbin/chkconfig ] && try "/sbin/chkconfig --add tarantool$id"
}
deploy_check() {
@@ -133,10 +133,10 @@ deploy_check() {
fi
# check, if there are any instance-related files exists that could be
# accidently removed or overwritten by setup.
- instance_workdir="${prefix_var}/tarantool_box$id"
- instance_config="${prefix_etc}/tarantool/tarantool_box$id.cfg"
- instance_wrapper="${prefix}/bin/tarantool_box$id.sh"
- instance_startup="${prefix_etc}/init.d/tarantool_box$id"
+ instance_workdir="${prefix_var}/tarantool$id"
+ instance_config="${prefix_etc}/tarantool/tarantool$id.cfg"
+ instance_wrapper="${prefix}/bin/tarantool$id.sh"
+ instance_startup="${prefix_etc}/init.d/tarantool$id"
[ -d $instance_workdir ] && error "Instance workdir exists: '$instance_workdir'"
[ -f $instance_config ] && error "Instance configuration file exists: $instance_config"
[ -f $instance_wrapper ] && error "Instance wrapper file exists: $instance_wrapper"
diff --git a/extra/tarantool_multi.sh b/extra/tarantool_multi.sh
index 46b998eb1e..0bd42759c4 100755
--- a/extra/tarantool_multi.sh
+++ b/extra/tarantool_multi.sh
@@ -5,7 +5,7 @@
export PATH=$PATH:/usr/bin
-NAME="tarantool_box"
+NAME="tarantool"
BINARY="/usr/bin/${NAME}"
INST=$(basename $0 .sh)
CONF="/etc/tarantool/${INST}.cfg"
--
GitLab