commit 75706af1a7d6b56cdbebd699efe1f65528ebf464
Author: Jan Palus <[email protected]>
Date: Sat Sep 3 22:29:37 2022 +0200
use /etc/redis.conf by default but allow override
redis.service | 3 ++-
redis.spec | 7 +++++--
redis.sysconfig | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/redis.spec b/redis.spec
index c1eb7c7..e8f2cbc 100644
--- a/redis.spec
+++ b/redis.spec
@@ -24,6 +24,7 @@ Source1: %{name}.logrotate
Source2: %{name}.init
Source3: %{name}.tmpfiles
Source4: %{name}.service
+Source5: %{name}.sysconfig
Patch0: %{name}.conf.patch
Patch1: %{name}-tcl.patch
Patch2:
0001-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch
@@ -120,7 +121,7 @@ sed -i -e "s/set ::port 21111/set ::port $port/"
tests/test_helper.tcl
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/sysconfig,%{_sbindir}} \
$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d} \
$RPM_BUILD_ROOT%{_localstatedir}/{{lib,log,run}/%{name},log/archive/%{name}} \
$RPM_BUILD_ROOT%{systemdtmpfilesdir} $RPM_BUILD_ROOT%{systemdunitdir} \
@@ -143,6 +144,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
cp -p %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
%{?with_systemd:%{__sed} -e 's;@sbindir@;%{_sbindir};' -e
's;@localstatedir@;%{_localstatedir};' %{SOURCE4} >
$RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service}
+%{__sed} -e 's;@sysconfdir@;%{_sysconfdir};' %{SOURCE5} >
$RPM_BUILD_ROOT/etc/sysconfig/%{name}
# man-pages
for man in man/man1/*; do
@@ -194,7 +196,8 @@ fi
%files server
%defattr(644,root,root,755)
-%config(noreplace) %{_sysconfdir}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
%attr(754,root,root) /etc/rc.d/init.d/%{name}
%attr(755,root,root) %{_sbindir}/redis-sentinel
%attr(755,root,root) %{_sbindir}/redis-server
diff --git a/redis.service b/redis.service
index 8203d56..9c26d13 100644
--- a/redis.service
+++ b/redis.service
@@ -5,7 +5,8 @@ Wants=network-online.target
After=network-online.target
[Service]
-ExecStart=@sbindir@/redis-server --supervised systemd --daemonize no
+EnvironmentFile=-/etc/sysconfig/redis
+ExecStart=@sbindir@/redis-server $CONFIG_FILE --supervised systemd --daemonize
no
LimitNOFILE=10032
NoNewPrivileges=yes
Type=notify
diff --git a/redis.sysconfig b/redis.sysconfig
new file mode 100644
index 0000000..1050e4d
--- /dev/null
+++ b/redis.sysconfig
@@ -0,0 +1 @@
+CONFIG_FILE=@sysconfdir@/redis.conf
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/redis.git/commitdiff/75706af1a7d6b56cdbebd699efe1f65528ebf464
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
