From 540ad2fb69aa1fa06774a5379888e5fcb023790b Mon Sep 17 00:00:00 2001
From: Dmitry Simonenko <pmwkaa@gmail.com>
Date: Fri, 11 Apr 2014 18:10:47 +0400
Subject: [PATCH] rpm build fix.
---
extra/rpm.spec.in | 2 +-
extra/tarantool_deploy.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extra/rpm.spec.in b/extra/rpm.spec.in
index 1778370db7..94046c3a43 100644
--- a/extra/rpm.spec.in
+++ b/extra/rpm.spec.in
@@ -153,7 +153,7 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
"%{_bindir}/tarantool_deploy.sh"
"/etc/init.d/tarantool"
-%dir "%{_sysconfdir}/tarantool"
+# %dir "%{_sysconfdir}/tarantool"
%files sql-module
%defattr(-,root,root,-)
diff --git a/extra/tarantool_deploy.sh b/extra/tarantool_deploy.sh
index 75be7c2738..15e891e93a 100755
--- a/extra/tarantool_deploy.sh
+++ b/extra/tarantool_deploy.sh
@@ -181,8 +181,8 @@ deploy_exists=0
# do migration from old deployment (if necessary)
if [ $deploy_exists -eq 0 ]; then
deploy_cfg_old="/usr/local/etc/tarantool_deploy.cfg"
+ mkdir -p /etc/tarantool
if [ -f $deploy_cfg_old ]; then
- mkdir -p /etc/tarantool
cp /usr/local/etc/tarantool* "${prefix_etc}/tarantool/"
deploy_exists=1
fi
--
GitLab