rpms/redis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

move redis-shutdown to libexec

Browse Source
This commit is contained in:
Remi Collet 2016-09-14 10:48:19 +02:00
parent d66975ecc1
commit 83364f086c
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redis-sentinel.init
View File

@ -10,7 +10,7 @@
name="redis-sentinel" name="redis-sentinel"
exec="/usr/bin/$name" exec="/usr/bin/$name"
shut="/usr/bin/redis-shutdown" shut="/usr/libexec/redis-shutdown"
pidfile="/var/run/redis/sentinel.pid" pidfile="/var/run/redis/sentinel.pid"
SENTINEL_CONFIG="/etc/redis-sentinel.conf" SENTINEL_CONFIG="/etc/redis-sentinel.conf"

2
redis-sentinel.service
View File

@ -4,7 +4,7 @@ After=network.target
[Service] [Service]
ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no 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 User=redis
Group=redis Group=redis

2
redis.init
View File

@ -10,7 +10,7 @@
name="redis-server" name="redis-server"
exec="/usr/bin/$name" exec="/usr/bin/$name"
shut="/usr/bin/redis-shutdown" shut="/usr/libexec/redis-shutdown"
pidfile="/var/run/redis/redis.pid" pidfile="/var/run/redis/redis.pid"
REDIS_CONFIG="/etc/redis.conf" REDIS_CONFIG="/etc/redis.conf"

2
redis.service
View File

@ -4,7 +4,7 @@ After=network.target
[Service] [Service]
ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no
ExecStop=/usr/bin/redis-shutdown ExecStop=/usr/libexec/redis-shutdown
User=redis User=redis
Group=redis Group=redis

6
redis.spec
View File

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