diff options
| -rw-r--r-- | redis-limit-systemd | 14 | ||||
| -rw-r--r-- | redis-sentinel.service | 13 | ||||
| -rw-r--r-- | redis.service | 13 | ||||
| -rw-r--r-- | redis.spec | 14 |
4 files changed, 32 insertions, 22 deletions
diff --git a/redis-limit-systemd b/redis-limit-systemd deleted file mode 100644 index a792937..0000000 --- a/redis-limit-systemd +++ /dev/null @@ -1,14 +0,0 @@ -# If you need to change max open file limit -# for example, when you change maxclient in configuration -# you can change the LimitNOFILE value below. -# See "man systemd.exec" for more information. - -# Slave nodes on large system may take lot of time to start. -# You may need to uncomment TimeoutStartSec and TimeoutStopSec -# directives below and raise their value. -# See "man systemd.service" for more information. - -[Service] -LimitNOFILE=10240 -#TimeoutStartSec=90s -#TimeoutStopSec=90s diff --git a/redis-sentinel.service b/redis-sentinel.service index 0bcc990..ffb748a 100644 --- a/redis-sentinel.service +++ b/redis-sentinel.service @@ -12,6 +12,19 @@ Group=redis RuntimeDirectory=redis RuntimeDirectoryMode=0755 +# If you need to change max open file limit +# for example, when you change maxclient in configuration +# you can change the LimitNOFILE value below. +# See "man systemd.exec" for more information. +LimitNOFILE=10240 + +# Slave nodes on large system may take lot of time to start. +# You may need to uncomment TimeoutStartSec and TimeoutStopSec +# directives below and raise their value. +# See "man systemd.service" for more information. +#TimeoutStartSec=90s +#TimeoutStopSec=90s + [Install] WantedBy=multi-user.target diff --git a/redis.service b/redis.service index a577c83..093cfd4 100644 --- a/redis.service +++ b/redis.service @@ -12,6 +12,19 @@ Group=redis RuntimeDirectory=redis RuntimeDirectoryMode=0755 +# If you need to change max open file limit +# for example, when you change maxclient in configuration +# you can change the LimitNOFILE value below. +# See "man systemd.exec" for more information. +LimitNOFILE=10240 + +# Slave nodes on large system may take lot of time to start. +# You may need to uncomment TimeoutStartSec and TimeoutStopSec +# directives below and raise their value. +# See "man systemd.service" for more information. +#TimeoutStartSec=90s +#TimeoutStopSec=90s + [Install] WantedBy=multi-user.target @@ -22,7 +22,7 @@ Name: redis Version: %{upstream_ver} -Release: 1%{?dist} +Release: 2%{?dist} Summary: A persistent key-value database # redis: RSALv2 or SSPLv1 or AGPLv3 (only AGPLv3 is OSS) # hiredis: BSD-3-Clause @@ -36,7 +36,6 @@ Source0: https://github.com/redis/redis/archive/refs/tags/%{version}.t Source1: %{name}.logrotate Source2: %{name}-sentinel.service Source3: %{name}.service -Source7: %{name}-limit-systemd Source9: macros.%{name} BuildRequires: gcc @@ -179,6 +178,8 @@ install -d %{buildroot}%{_sharedstatedir}/%{name} install -d %{buildroot}%{_localstatedir}/log/%{name} install -d %{buildroot}%{_localstatedir}/run/%{name} install -d %{buildroot}%{redis_modules_dir} +install -d %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d +install -d %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d # Install logrotate file. install -pDm644 %{S:1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} @@ -192,10 +193,6 @@ mkdir -p %{buildroot}%{_unitdir} install -pm644 %{S:3} %{buildroot}%{_unitdir} install -pm644 %{S:2} %{buildroot}%{_unitdir} -# Install systemd limit files (requires systemd >= 204) -install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf -install -p -D -m 644 %{S:7} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf - # Fix non-standard-executable-perm error. chmod 755 %{buildroot}%{_bindir}/%{name}-* @@ -307,9 +304,7 @@ fi %{_unitdir}/%{name}.service %{_unitdir}/%{name}-sentinel.service %dir %{_sysconfdir}/systemd/system/%{name}.service.d -%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf %dir %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d -%config(noreplace) %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf %dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name} %files devel @@ -319,6 +314,9 @@ fi %changelog +* Thu Jun 19 2025 Remi Collet <remi@remirepo.net> - 8.0.2-2 +- remove limit.conf config files + * Wed May 28 2025 Remi Collet <remi@remirepo.net> - 8.0.2-1 - Redis 8.0.2 Released Tue 27 May 2025 12:00:00 IST - Update urgency: SECURITY: CVE-2025-27151 |