summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-09-14 10:48:39 +0200
committerRemi Collet <fedora@famillecollet.com>2016-09-14 10:48:39 +0200
commit31ab3b309a10c9ebaa89fe9f0d8d77556553253f (patch)
treeb121a8176edadacd358274d5584f67814bb5e79d
parent23bda2f8bd53a82fd0970d6b204bdffc36559fec (diff)
redis: move redis-shutdown to libexec
-rw-r--r--redis-sentinel.init2
-rw-r--r--redis-sentinel.service2
-rw-r--r--redis.init2
-rw-r--r--redis.service2
-rw-r--r--redis.spec8
5 files changed, 10 insertions, 6 deletions
diff --git a/redis-sentinel.init b/redis-sentinel.init
index e9d3c34..a3b82df 100644
--- a/redis-sentinel.init
+++ b/redis-sentinel.init
@@ -10,7 +10,7 @@
name="redis-sentinel"
exec="/usr/bin/$name"
-shut="/usr/bin/redis-shutdown"
+shut="/usr/libexec/redis-shutdown"
pidfile="/var/run/redis/sentinel.pid"
SENTINEL_CONFIG="/etc/redis-sentinel.conf"
diff --git a/redis-sentinel.service b/redis-sentinel.service
index 2ec86ae..47b3e53 100644
--- a/redis-sentinel.service
+++ b/redis-sentinel.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no
-ExecStop=/usr/bin/redis-shutdown redis-sentinel
+ExecStop=/usr/libexec/redis-shutdown redis-sentinel
User=redis
Group=redis
diff --git a/redis.init b/redis.init
index 96385eb..a459076 100644
--- a/redis.init
+++ b/redis.init
@@ -10,7 +10,7 @@
name="redis-server"
exec="/usr/bin/$name"
-shut="/usr/bin/redis-shutdown"
+shut="/usr/libexec/redis-shutdown"
pidfile="/var/run/redis/redis.pid"
REDIS_CONFIG="/etc/redis.conf"
diff --git a/redis.service b/redis.service
index 1c549b4..0e4eed0 100644
--- a/redis.service
+++ b/redis.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no
-ExecStop=/usr/bin/redis-shutdown
+ExecStop=/usr/libexec/redis-shutdown
User=redis
Group=redis
diff --git a/redis.spec b/redis.spec
index e675748..180af78 100644
--- a/redis.spec
+++ b/redis.spec
@@ -28,7 +28,7 @@
Name: redis
Version: 3.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A persistent key-value database
Group: Applications/Databases
@@ -183,7 +183,7 @@ install -p -D -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/security/limits.d/95-
chmod 755 %{buildroot}%{_bindir}/%{name}-*
# Install redis-shutdown
-install -pDm755 %{SOURCE7} %{buildroot}%{_bindir}/%{name}-shutdown
+install -pDm755 %{SOURCE7} %{buildroot}%{_libexecdir}/%{name}-shutdown
# Install man pages
man=$(dirname %{buildroot}%{_mandir})
@@ -250,6 +250,7 @@ fi
%dir %attr(0750, redis, redis) %{_localstatedir}/lib/%{name}
%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name}
%{_bindir}/%{name}-*
+%{_libexecdir}/%{name}-*
%{_mandir}/man1/redis*
%{_mandir}/man5/redis*
%if %{with_systemd}
@@ -268,6 +269,9 @@ fi
%changelog
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-4
+- move redis-shutdown to libexec
+
* Fri Sep 9 2016 Remi Collet <remi@fedoraproject.org> - 3.2.3-3
- add patch from https://github.com/antirez/redis/pull/3494