From 5156d2779cb2d53f2bc2f6694fbea2757359076169d0bd34dd9fc3d58297384b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 18 Mar 2021 14:23:57 +0000 Subject: [PATCH] Accepting request 878769 from home:stroeder:branches:server:database - replaced /var/run with /run for all PID file paths OBS-URL: https://build.opensuse.org/request/show/878769 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=171 --- README.SUSE | 8 ++++---- redis-conf.patch | 4 ++-- redis-sentinel@.service | 2 +- redis.changes | 5 +++++ redis@.service | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.SUSE b/README.SUSE index 770b452..339f910 100644 --- a/README.SUSE +++ b/README.SUSE @@ -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". diff --git a/redis-conf.patch b/redis-conf.patch index 960ae64..39b36ea 100644 --- a/redis-conf.patch +++ b/redis-conf.patch @@ -25,7 +25,7 @@ Index: redis.conf # 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: @@ -62,7 +62,7 @@ Index: sentinel.conf # /var/run/redis-sentinel.pid by default. You can specify a custom pid file # location here. -pidfile /var/run/redis-sentinel.pid -+pidfile /var/run/redis/sentinel-default.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 diff --git a/redis-sentinel@.service b/redis-sentinel@.service index 24a3ec6..1701c38 100644 --- a/redis-sentinel@.service +++ b/redis-sentinel@.service @@ -8,7 +8,7 @@ Type=notify User=redis Group=redis PrivateTmp=true -PIDFile=/var/run/redis/sentinel-%i.pid +PIDFile=/run/redis/sentinel-%i.pid ExecStart=/usr/sbin/redis-sentinel /etc/redis/sentinel-%i.conf LimitNOFILE=10240 Restart=on-failure diff --git a/redis.changes b/redis.changes index 5018ba5..eb0ebec 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 13 14:28:47 UTC 2021 - Michael Ströder + +- replaced /var/run with /run for all PID file paths + ------------------------------------------------------------------- Thu Mar 4 13:21:32 UTC 2021 - Gareth McCarter diff --git a/redis@.service b/redis@.service index 00afbd0..124f47d 100644 --- a/redis@.service +++ b/redis@.service @@ -8,7 +8,7 @@ Type=notify User=redis Group=redis PrivateTmp=true -PIDFile=/var/run/redis/%i.pid +PIDFile=/run/redis/%i.pid ExecStart=/usr/sbin/redis-server /etc/redis/%i.conf LimitNOFILE=10240 Restart=on-failure