summaryrefslogtreecommitdiff
path: root/databases/redis/files/patch-redis.conf
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2013-11-28 17:53:32 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2013-11-28 17:53:32 +0000
commitcc50e0274ce361cbbcac3e1c5e9477445556837e (patch)
tree38fc0644b420e7aedec1f8730dea89c8416a5790 /databases/redis/files/patch-redis.conf
parent- Use QMAKE_PRO instead of do-configure (diff)
Upgrade from 2.6.16 to 2.8.0.
Changelist: https://raw.github.com/antirez/redis/2.8/00-RELEASENOTES
Diffstat (limited to 'databases/redis/files/patch-redis.conf')
-rw-r--r--databases/redis/files/patch-redis.conf22
1 files changed, 11 insertions, 11 deletions
diff --git a/databases/redis/files/patch-redis.conf b/databases/redis/files/patch-redis.conf
index d105b89a9e95..0ade1ddf1195 100644
--- a/databases/redis/files/patch-redis.conf
+++ b/databases/redis/files/patch-redis.conf
@@ -1,5 +1,5 @@
---- redis.conf.orig 2010-07-02 16:00:49.000000000 +0400
-+++ redis.conf 2010-07-02 16:01:46.000000000 +0400
+--- redis.conf.orig 2013-08-13 15:40:42.000000000 +0400
++++ redis.conf 2013-08-13 15:42:50.000000000 +0400
@@ -14,11 +14,11 @@
# By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -12,19 +12,19 @@
-pidfile /var/run/redis.pid
+pidfile %%REDIS_RUNDIR%%/redis.pid
- # Accept connections on the specified port, default is 6379
- port 6379
-@@ -42,7 +42,7 @@
- # Specify the log file name. Also 'stdout' can be used to force
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+@@ -71,7 +71,7 @@
+ # Specify the log file name. Also the emptry 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
--logfile stdout
+-logfile ""
+logfile %%REDIS_LOGDIR%%/redis.log
- # Set the number of databases. The default database is DB 0, you can select
- # a different one on a per-connection basis using SELECT <dbid> where
-@@ -86,7 +86,7 @@
- # Also the Append Only File will be created inside this directory.
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -155,7 +155,7 @@
+ # The Append Only File will also be created inside this directory.
#
# Note that you must specify a directory here, not a file name.
-dir ./