summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-12-13 10:12:22 +0100
committerRemi Collet <fedora@famillecollet.com>2014-12-13 10:12:22 +0100
commita355b24ed1756ab91ce171463a4afdb8737ebbbc (patch)
treefff287b8cb11de030e4daabf3ebe03ee14d4cf47
parent2e64c95833b0d06d7b98c31978e0c52f08c183f9 (diff)
redis: provides /etc/systemd/system/redis.service.d/limit.conf
-rw-r--r--redis-limit7
-rw-r--r--redis.spec23
2 files changed, 27 insertions, 3 deletions
diff --git a/redis-limit b/redis-limit
new file mode 100644
index 0000000..969d6e8
--- /dev/null
+++ b/redis-limit
@@ -0,0 +1,7 @@
+# If you need to change max open file limit
+# for example, when you change maxclient in redis.conf
+# you can change the LimitNOFILE above value
+# see "man systemd.exec" for information
+
+[Service]
+LimitNOFILE=10240
diff --git a/redis.spec b/redis.spec
index 37ad73f..1f64021 100644
--- a/redis.spec
+++ b/redis.spec
@@ -5,13 +5,19 @@
%else
%global with_systemd 0
%endif
+# systemd >= 204 with additional service config
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global with_systemdmax 1
+%else
+%global with_systemdmax 0
+%endif
# Tests fail in mock, not in local build.
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: redis
Version: 2.8.18
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Summary: A persistent key-value database
Group: Applications/Databases
@@ -25,6 +31,8 @@ Source4: %{name}.tmpfiles
Source5: %{name}-sentinel.init
Source6: %{name}-sentinel.service
Source7: %{name}-shutdown
+Source8: %{name}-limit
+
# Update configuration for Fedora
Patch0: 0001-redis-2.8.18-redis-conf.patch
Patch1: 0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch
@@ -111,9 +119,11 @@ install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-sentinel.service
# Install systemd tmpfiles config, _tmpfilesdir only defined in fedora >= 18
install -p -D -m 644 %{SOURCE4} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
+%if %{with_systemdmax}
+# this folder requires systemd >= 204
+install -p -D -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
+%endif
%else
-sed -e '/^daemonize/s/no/yes/' \
- -i %{buildroot}%{_sysconfdir}/%{name}.conf
install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}
install -p -D -m 755 %{SOURCE5} %{buildroot}%{_initrddir}/%{name}-sentinel
%endif
@@ -209,6 +219,10 @@ fi
%{_prefix}/lib/tmpfiles.d/%{name}.conf
%{_unitdir}/%{name}.service
%{_unitdir}/%{name}-sentinel.service
+%if %{with_systemdmax}
+%dir %{_sysconfdir}/systemd/system/%{name}.service.d
+%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
+%endif
%else
%{_initrddir}/%{name}
%{_initrddir}/%{name}-sentinel
@@ -216,6 +230,9 @@ fi
%changelog
+* Sat Dec 13 2014 Remi Collet <remi@fedoraproject.org> - 2.8.18-2
+- provides /etc/systemd/system/redis.service.d/limit.conf
+
* Thu Dec 4 2014 Remi Collet <remi@fedoraproject.org> - 2.8.18-1.1
- EL-5 rebuild with upstream patch