On Fri, 7 Feb 2020 16:34:10 -0500, Daniel Jakots <[email protected]> wrote:

> On Thu, 6 Feb 2020 19:00:19 +0100, Charlene Wendling
> <[email protected]> wrote:
> 
> > Below is the original diff with an additional patch to fix that. I
> > did run the tests and it's still fine.  
> 
> Tested this diff as it seems to be the latest full diff. It works fine
> for me. ok danj@

I just noticed sentinel.conf was updated. Shouldn't we apply the same
change for it than we do for redis.conf?

Index: patches/patch-sentinel_conf
===================================================================
RCS file: /cvs/ports/databases/redis/patches/patch-sentinel_conf,v
retrieving revision 1.6
diff -u -p -r1.6 patch-sentinel_conf
--- patches/patch-sentinel_conf 2 Sep 2018 11:08:51 -0000       1.6
+++ patches/patch-sentinel_conf 7 Feb 2020 21:43:06 -0000
@@ -2,7 +2,25 @@ $OpenBSD: patch-sentinel_conf,v 1.6 2018
 Index: sentinel.conf
 --- sentinel.conf.orig
 +++ sentinel.conf
-@@ -167,7 +167,7 @@ sentinel failover-timeout mymaster 180000
+@@ -21,14 +21,14 @@
+ port 26379
+ 
+ # By default Redis Sentinel does not run as a daemon. Use 'yes' if you need 
it.
+-# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when
++# Note that Redis will write a pid file in /var/run/redis/redis-sentinel.pid 
when
+ # daemonized.
+ daemonize no
+ 
+ # When running daemonized, Redis Sentinel writes a pid file in
+-# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
++# /var/run/redis/redis-sentinel.pid by default. You can specify a custom pid 
file
+ # location here.
+-pidfile /var/run/redis-sentinel.pid
++pidfile /var/run/redis/redis-sentinel.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
+@@ -182,7 +182,7 @@ sentinel failover-timeout mymaster 180000
  #
  # Example:
  #
@@ -11,7 +29,7 @@ Index: sentinel.conf
  
  # CLIENTS RECONFIGURATION SCRIPT
  #
-@@ -192,7 +192,7 @@ sentinel failover-timeout mymaster 180000
+@@ -207,7 +207,7 @@ sentinel failover-timeout mymaster 180000
  #
  # Example:
  #


Full diff available at https://chown.me/iota/ports/redis.diff if it
helps.

Reply via email to