diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/debian-packaging/0001-Set-Debian-configuration-defaults.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/debian/patches/debian-packaging/0001-Set-Debian-configuration-defaults.patch b/debian/patches/debian-packaging/0001-Set-Debian-configuration-defaults.patch new file mode 100644 index 0000000..dffad10 --- /dev/null +++ b/debian/patches/debian-packaging/0001-Set-Debian-configuration-defaults.patch @@ -0,0 +1,93 @@ +From: Chris Lamb <lamby@debian.org> +Date: Tue, 10 Oct 2017 09:56:42 +0100 +Subject: Set Debian configuration defaults + +Forwarded: not-needed +--- + redis.conf | 10 +++++----- + sentinel.conf | 8 ++++---- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/redis.conf b/redis.conf +index 0431c37..f0491a3 100644 +--- a/redis.conf ++++ b/redis.conf +@@ -152,7 +152,7 @@ tcp-backlog 511 + # incoming connections. There is no default, so Redis will not listen + # on a unix socket when not specified. + # +-# unixsocket /run/redis.sock ++# unixsocket /run/redis/redis-server.sock + # unixsocketperm 700 + + # Close the connection after a client is idle for N seconds (0 to disable) +@@ -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: +@@ -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/redis-server.pid + + # Specify the server verbosity level. + # This can be one of: +@@ -351,7 +351,7 @@ 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 /var/log/redis/redis-server.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. +@@ -501,7 +501,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 + + ################################# REPLICATION ################################# + +diff --git a/sentinel.conf b/sentinel.conf +index bba9b92..8070b24 100644 +--- a/sentinel.conf ++++ b/sentinel.conf +@@ -12,17 +12,17 @@ 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 + # daemonized. +-daemonize no ++daemonize yes + + # 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/sentinel/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 + # output for logging but daemonize, logs will be sent to /dev/null +-logfile "" ++logfile /var/log/redis/redis-sentinel.log + + # sentinel announce-ip <ip> + # sentinel announce-port <port> +@@ -51,7 +51,7 @@ logfile "" + # For Redis Sentinel to chdir to /tmp at startup is the simplest thing + # for the process to don't interfere with administrative tasks such as + # unmounting filesystems. +-dir /tmp ++dir /var/lib/redis + + # sentinel monitor <master-name> <ip> <redis-port> <quorum> + # |