diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2016-06-18 16:03:17 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2016-06-18 16:03:17 +0000 |
| commit | 5bae44dae0b82bdfca7744c4499dcb24feda1032 (patch) | |
| tree | bf74764518f6bb2a811d15904e556ee7d729c222 /databases/redis-devel/files/patch-redis.conf | |
| parent | Nuke useless @exec and @dir (diff) | |
Upgrade from 3.2.0 to 3.2.1.
Upgrade urgency HIGH: Critical fix to Redis Sentinel, due to
3.2.0 regression compared to 3.0.
ChangeLog: https://raw.githubusercontent.com/antirez/redis/3.2/00-RELEASENOTES
Diffstat (limited to 'databases/redis-devel/files/patch-redis.conf')
| -rw-r--r-- | databases/redis-devel/files/patch-redis.conf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/redis-devel/files/patch-redis.conf b/databases/redis-devel/files/patch-redis.conf index a5b8e3605ba7..5e8d12a9e10b 100644 --- a/databases/redis-devel/files/patch-redis.conf +++ b/databases/redis-devel/files/patch-redis.conf @@ -1,6 +1,6 @@ ---- redis.conf.orig 2016-02-02 19:40:49.234427000 -0500 -+++ redis.conf 2016-02-02 19:42:23.136334000 -0500 -@@ -124,7 +124,7 @@ +--- redis.conf.orig 2016-06-17 09:15:21.000000000 -0400 ++++ redis.conf 2016-06-18 11:58:19.871082000 -0400 +@@ -125,7 +125,7 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. @@ -9,16 +9,16 @@ # If you run Redis from upstart or systemd, Redis can interact with your # supervision tree. Options: -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. --pidfile /var/run/redis.pid +-pidfile /var/run/redis_6379.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Specify the server verbosity level. # This can be one of: -@@ -159,7 +159,7 @@ +@@ -160,7 +160,7 @@ # Specify the log file name. Also the empty string can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null @@ -27,7 +27,7 @@ # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. -@@ -243,7 +243,7 @@ +@@ -244,7 +244,7 @@ # The Append Only File will also be created inside this directory. # # Note that you must specify a directory here, not a file name. |