Commit a69bf09b authored by Henrik Triem's avatar Henrik Triem
Browse files

Update to version 6.2.3

parent 9a668cd3
Pipeline #18313 failed with stages
in 5 minutes and 7 seconds
......@@ -15,13 +15,13 @@ chmod u=rw,g=r,o= /etc/redis/instancename.conf
2. change at least pidfile, logfile and dir setting
# the pid file *has* to match your config filename without the ".conf"
pidfile /var/run/redis/instancename.pid
pidfile /run/redis/instancename.pid
logfile /var/log/redis/instancename.log
dir /var/lib/redis/instancename/
If you want to run more than one instance you also have to change the
socket path and/or the ip:port combination.
e.g. /var/run/redis/instancename.sock
e.g. /run/redis/instancename.sock
Also make sure if you copy configurations from somewhere, that "daemonize"
should be set to "no".
......@@ -54,12 +54,12 @@ The chmod line differs from the line for the normal redis server.
2. change at least pidfile, logfile setting
# the pid file *has* to match your config filename without the ".conf"
pidfile /var/run/redis/instancename.pid
pidfile /run/redis/instancename.pid
logfile /var/log/redis/instancename.log
If you want to run more than one instance you also have to change the
socket path and/or the ip:port combination.
e.g. /var/run/redis/instancename.sock
e.g. /run/redis/instancename.sock
Also make sure if you copy configurations from somewhere, that "daemonize"
should be set to "no".
......
......@@ -2,34 +2,34 @@ Index: redis.conf
===================================================================
--- redis.conf.orig
+++ redis.conf
@@ -221,7 +221,7 @@ tcp-keepalive 300
+@@ -244,7 +244,7 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
# When Redis is supervised by upstart or systemd, this parameter has no impact.
-daemonize no
+daemonize yes
# If you run Redis from upstart or systemd, Redis can interact with your
# supervision tree. Options:
@@ -233,7 +233,7 @@ daemonize no
# UPSTART_JOB or NOTIFY_SOCKET environment variables
# Note: these supervision methods only signal "process is ready."
# They do not enable continuous pings back to your supervisor.
-supervised no
@@ -262,7 +262,7 @@
# The default is "no". To run under upstart/systemd, you can simply uncomment
# the line below:
#
-# supervised auto
+supervised systemd
# If a pid file is specified, Redis writes it where specified at startup
# and removes it at exit.
@@ -244,7 +244,7 @@ supervised no
@@ -276,7 +276,7 @@
#
# Creating a pid file is best effort: if Redis is not able to create it
# nothing bad happens, the server will start and run normally.
# Note that on modern Linux systems "/run/redis.pid" is more conforming
# and should be used instead.
-pidfile /var/run/redis_6379.pid
+pidfile /var/run/redis/default.pid
+pidfile /run/redis/default.pid
# Specify the server verbosity level.
# This can be one of:
@@ -257,7 +257,8 @@ loglevel notice
@@ -289,7 +289,8 @@
# Specify the log file name. Also the empty string can be used to force
# Redis to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
......@@ -39,7 +39,7 @@ Index: redis.conf
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs.
@@ -362,7 +363,7 @@ rdb-del-sync-files no
@@ -441,7 +442,7 @@
# The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
......@@ -52,12 +52,24 @@ Index: sentinel.conf
===================================================================
--- sentinel.conf.orig
+++ sentinel.conf
@@ -1,4 +1,8 @@
# Example sentinel.conf
+#
+pidfile /var/run/redis/sentinel-default.pid
@@ -24,16 +24,18 @@
# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when
# daemonized.
daemonize no
+supervised systemd
# When running daemonized, Redis Sentinel writes a pid file in
# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
# location here.
-pidfile /var/run/redis-sentinel.pid
+pidfile /run/redis/sentinel-default.pid
# Specify the log file name. Also the empty string can be used to force
# Sentinel to log on the standard output. Note that if you use standard
# output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+loglevel notice
+logfile /var/log/redis/sentinel-default.log
# *** IMPORTANT ***
#
# sentinel announce-ip <ip>
# sentinel announce-port <port>
......@@ -24,13 +24,13 @@
%global src_name redis
Name: %{?pkg_prefix}%{src_name}
Version: 6.0.9
Version: 6.2.3
Release: 3
Summary: Persistent key-value database
License: BSD-3-Clause
Group: Productivity/Databases/Servers
URL: https://redis.io
Source0: http://download.redis.io/releases/redis-%{version}.tar.gz
Source0: https://download.redis.io/releases/redis-%{version}.tar.gz
Source1: %{src_name}.logrotate
Source4: %{src_name}.tmpfiles.d
Source5: README.SUSE
......@@ -42,7 +42,7 @@ Patch2: reproducible.patch
Patch3: getMcontextEip-return-value.patch
Patch4: ppc-atomic.patch
Patch5: icinga-server-port.patch
BuildRequires: libopenssl-devel
BuildRequires: libopenssl-devel >= 1.1.1
BuildRequires: pkgconfig
BuildRequires: procps
BuildRequires: tcl
......@@ -75,7 +75,7 @@ export HOST=OBS # for reproducible builds
make %{?_smp_mflags} CFLAGS="%{optflags}" BUILD_TLS=yes V=1
%install
install -m 0750 -d \
install -pm0750 -d \
%{buildroot}%{_sbindir} \
%{buildroot}%{_log_dir} \
%{buildroot}%{_data_dir} \
......@@ -83,20 +83,20 @@ install -m 0750 -d \
%{buildroot}%{_log_dir} \
%{buildroot}%{_data_dir}
install -Dpm 0755 src/%{src_name}-benchmark %{buildroot}%{_bindir}/%{name}-benchmark
install -Dpm 0755 src/%{src_name}-cli %{buildroot}%{_bindir}/%{name}-cli
install -Dpm 0755 src/%{src_name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib.rb
install -Dpm0755 src/%{src_name}-benchmark %{buildroot}%{_bindir}/%{name}-benchmark
install -Dpm0755 src/%{src_name}-cli %{buildroot}%{_bindir}/%{name}-cli
install -Dpm0755 src/%{src_name}-trib.rb %{buildroot}%{_bindir}/%{name}-trib.rb
install -Dpm 0755 src/%{src_name}-server %{buildroot}%{_sbindir}/%{name}-server
install -Dpm0755 src/%{src_name}-server %{buildroot}%{_sbindir}/%{name}-server
ln -sfv ../sbin/%{name}-server %{buildroot}%{_bindir}/%{name}-check-aof
ln -sfv ../sbin/%{name}-server %{buildroot}%{_bindir}/%{name}-check-rdb
ln -sfv ../sbin/%{name}-server %{buildroot}%{_sbindir}/%{name}-check-aof
ln -sfv ../sbin/%{name}-server %{buildroot}%{_sbindir}/%{name}-check-rdb
ln -sfv ../sbin/%{name}-server %{buildroot}%{_sbindir}/%{name}-sentinel
ln -sfv ../sbin/%{name}-server %{buildroot}%{_bindir}/%{name}-check-aof
ln -sfv ../sbin/%{name}-server %{buildroot}%{_bindir}/%{name}-check-rdb
ln -sfv ../sbin/%{name}-server %{buildroot}%{_sbindir}/%{name}-check-aof
ln -sfv ../sbin/%{name}-server %{buildroot}%{_sbindir}/%{name}-check-rdb
ln -sfv ../sbin/%{name}-server %{buildroot}%{_sbindir}/%{name}-sentinel
perl -p -i -e 's|daemonize yes|daemonize no|g' %{name}.conf
install -Dm 0640 redis.conf %{buildroot}%{_conf_dir}/redis.conf
install -Dpm0640 redis.conf %{buildroot}%{_conf_dir}/redis.conf
cp %{SOURCE5} README.SUSE
......@@ -132,8 +132,12 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%config(noreplace) %attr(-,root,%{name}) %{_conf_dir}/
%dir %attr(0750,%{name},%{name}) %{_data_dir}
%dir %attr(0750,%{name},%{name}) %{_log_dir}
%ghost %dir /run/%{name}
%changelog
* Wed Jun 02 2021 Henrik Triem <henrik.triem@icinga.com> - 6.2.3-1
- Update to 6.2.3
* Mon Dec 07 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 6.0.9-1
- Update to 6.0.9
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment