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 5bd2e5e..a15b8f3 100644 --- a/redis.spec +++ b/redis.spec @@ -166,7 +166,7 @@ install -p -D -m 644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{na chmod 755 %{buildroot}%{_bindir}/%{name}-* # Install redis-shutdown -install -pDm755 %{S:7} %{buildroot}%{_bindir}/%{name}-shutdown +install -pDm755 %{S:7} %{buildroot}%{_libexecdir}/%{name}-shutdown # Install man pages man=$(dirname %{buildroot}%{_mandir}) @@ -233,6 +233,7 @@ fi %dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name} %dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name} %{_bindir}/%{name}-* +%{_libexecdir}/%{name}-* %{_mandir}/man1/%{name}* %{_mandir}/man5/%{name}* %if 0%{?with_systemd} @@ -251,13 +252,14 @@ fi %changelog -* Fri Sep 9 2016 Remi Collet - 3.2.3-2 +* Wed Sep 14 2016 Remi Collet - 3.2.3-2 - add missing man pages #1374577 using patch from https://github.com/antirez/redis/pull/3491 - data and configuration should not be publicly readable #1374700 - remove /var/run/redis with systemd #1374728 - provide redis-check-rdb as a symlink to redis-server #1374736 using patch from https://github.com/antirez/redis/pull/3494 +- move redis-shutdown to libexec * Thu Aug 4 2016 Haïkel Guémar - 3.2.3-1 - Upstream 3.2.3