78 lines
2.8 KiB
Diff
78 lines
2.8 KiB
Diff
|
diff --git a/redis.conf b/redis.conf
|
||
|
|
index 97f077b0d..6ba6b290e 100644
|
||
|
|
--- a/redis.conf
|
||
|
|
+++ b/redis.conf
|
||
|
|
@@ -306,7 +306,7 @@ tcp-keepalive 300
|
||
|
|
# 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.
|
||
|
|
# When Redis is supervised by upstart or systemd, this parameter has no impact.
|
||
|
|
-daemonize no
|
||
|
|
+daemonize yes
|
||
|
|
|
||
|
|
# If you run Redis from upstart or systemd, Redis can interact with your
|
||
|
|
# supervision tree. Options:
|
||
|
|
@@ -324,7 +324,7 @@ daemonize no
|
||
|
|
# The default is "no". To run under upstart/systemd, you can simply uncomment
|
||
|
|
# the line below:
|
||
|
|
#
|
||
|
|
-# supervised auto
|
||
|
|
+supervised systemd
|
||
|
|
|
||
|
|
# If a pid file is specified, Redis writes it where specified at startup
|
||
|
|
# and removes it at exit.
|
||
|
|
@@ -338,7 +338,7 @@ daemonize no
|
||
|
|
#
|
||
|
|
# Note that on modern Linux systems "/run/redis.pid" is more conforming
|
||
|
|
# and should be used instead.
|
||
|
|
-pidfile /var/run/redis_6379.pid
|
||
|
|
+pidfile /run/redis/default.pid
|
||
|
|
|
||
|
|
# Specify the server verbosity level.
|
||
|
|
# This can be one of:
|
||
|
|
@@ -352,7 +352,8 @@ loglevel notice
|
||
|
|
# 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
|
||
|
|
-logfile ""
|
||
|
|
+# logfile ""
|
||
|
|
+logfile /var/log/redis/default.log
|
||
|
|
|
||
|
|
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
|
||
|
|
# and optionally update the other syslog parameters to suit your needs.
|
||
|
|
@@ -507,7 +508,7 @@ rdb-del-sync-files no
|
||
|
|
# The Append Only File will also be created inside this directory.
|
||
|
|
#
|
||
|
|
# Note that you must specify a directory here, not a file name.
|
||
|
|
-dir ./
|
||
|
|
+dir /var/lib/redis/default/
|
||
|
|
|
||
|
|
################################# REPLICATION #################################
|
||
|
|
|
||
|
|
diff --git a/sentinel.conf b/sentinel.conf
|
||
|
|
index b7b3604f0..8262608ad 100644
|
||
|
|
--- a/sentinel.conf
|
||
|
|
+++ b/sentinel.conf
|
||
|
|
@@ -13,11 +13,12 @@ port 26379
|
||
|
|
# Note that Redis will write a pid file in /var/run/redis-sentinel.pid when
|
||
|
|
# daemonized.
|
||
|
|
daemonize no
|
||
|
|
+supervised systemd
|
||
|
|
|
||
|
|
# When running daemonized, Redis Sentinel writes a pid file in
|
||
|
|
# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
|
||
|
|
# location here.
|
||
|
|
-pidfile /var/run/redis-sentinel.pid
|
||
|
|
+pidfile /run/redis/sentinel-default.pid
|
||
|
|
|
||
|
|
# Specify the server verbosity level.
|
||
|
|
# This can be one of:
|
||
|
|
@@ -31,7 +32,7 @@ loglevel notice
|
||
|
|
# 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
|
||
|
|
# output for logging but daemonize, logs will be sent to /dev/null
|
||
|
|
-logfile ""
|
||
|
|
+logfile /var/log/redis/sentinel-default.log
|
||
|
|
|
||
|
|
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
|
||
|
|
# and optionally update the other syslog parameters to suit your needs.
|