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

Incorporate recent feedback from Haikel and Remi

Browse Source 
Add "--supervised systemd" to the command line, and
drop the "--daemonize" option as Redis already does
this internally in supervised mode.

Add Provides:bundled spec file lines for linenoise,
lua-libs and hiredis.
This commit is contained in:
Nathan Scott 2017-09-07 16:09:03 +10:00
parent 9f0877ed49
commit c374de3637
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
View File

@ -1,7 +1,7 @@
From e1ded77b1f80a5241f2f9b5088b9063ecbeb72c9 Mon Sep 17 00:00:00 2001 From e1ded77b1f80a5241f2f9b5088b9063ecbeb72c9 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com> From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 8 Sep 2016 14:51:15 +0200 Date: Thu, 8 Sep 2016 14:51:15 +0200
Subject: [PATCH 6/7] 1st man pageis for - redis-cli - redis-benchmark - Subject: [PATCH 1/2] 1st man pageis for - redis-cli - redis-benchmark -
redis-check-aof - redis-check-rdb - redis-server - redis.conf redis-check-aof - redis-check-rdb - redis-server - redis.conf
as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked) as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked)

2
0002-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch
View File

@ -1,7 +1,7 @@
From bcd509def0d4a75f56d9d6a53eea280127803eb4 Mon Sep 17 00:00:00 2001 From bcd509def0d4a75f56d9d6a53eea280127803eb4 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com> From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 9 Sep 2016 17:23:27 +0200 Date: Fri, 9 Sep 2016 17:23:27 +0200
Subject: [PATCH 7/7] install redis-check-rdb as a symlink instead of Subject: [PATCH 2/2] install redis-check-rdb as a symlink instead of
duplicating the binary duplicating the binary
--- ---

2
redis-sentinel.service
View File

@ -3,7 +3,7 @@ Description=Redis Sentinel
After=network.target 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 --supervised systemd
ExecStop=/usr/libexec/redis-shutdown redis-sentinel ExecStop=/usr/libexec/redis-shutdown redis-sentinel
Type=notify Type=notify
User=redis User=redis

2
redis.service
View File

@ -3,7 +3,7 @@ Description=Redis persistent key-value database
After=network.target After=network.target
[Service] [Service]
ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no ExecStart=/usr/bin/redis-server /etc/redis.conf --supervised systemd
ExecStop=/usr/libexec/redis-shutdown ExecStop=/usr/libexec/redis-shutdown
Type=notify Type=notify
User=redis User=redis

8
redis.spec
View File

@ -69,6 +69,9 @@ Requires(preun): chkconfig
Requires(preun): initscripts Requires(preun): initscripts
Requires(postun): initscripts Requires(postun): initscripts
%endif %endif
Provides: bundled(hiredis)
Provides: bundled(lua-libs)
Provides: bundled(linenoise)
%description %description
Redis is an advanced key-value store. It is often referred to as a data Redis is an advanced key-value store. It is often referred to as a data
@ -165,7 +168,7 @@ install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -pDm640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf install -pDm640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
install -pDm640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf install -pDm640 sentinel.conf %{buildroot}%{_sysconfdir}/%{name}-sentinel.conf
# Install Systemd unit files. # Install systemd unit files.
%if 0%{?with_systemd} %if 0%{?with_systemd}
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -pm644 %{S:3} %{buildroot}%{_unitdir} install -pm644 %{S:3} %{buildroot}%{_unitdir}
@ -285,8 +288,9 @@ fi
%changelog %changelog
* Mon Aug 28 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-3 * Wed Sep 06 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-3
- Switch to using Type=notify for Redis systemd services (RHBZ #1172841) - Switch to using Type=notify for Redis systemd services (RHBZ #1172841)
- Add Provides:bundled hiredis, linenoise, lua-libs clauses (RHBZ #788500)
* Mon Aug 14 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-2 * Mon Aug 14 2017 Nathan Scott <nathans@redhat.com> - 3.2.10-2
- Add redis-trib based on patch from Sebastian Saletnik. (RHBZ #1215654) - Add redis-trib based on patch from Sebastian Saletnik. (RHBZ #1215654)