forked from pool/redis
Adam Majer
6d310f150c
- make check && true -> make check || true
This was probably meant to catch an error in the test suite, but
with && it would only return true if it would return true
already.
- added systemd unit file file redis-sentinel
- the unit file uses the same multiple instance mechanism as the
normal redis unit file
systemctl start redis-sentinel@default will look for
/etc/redis/sentinel-default.conf
and expects a pid file
/var/run/redis/sentinel-default.pid
Please make sure your sentinel config sets the pid file.
- adapted the default sentinel.conf.example to set the pid file
and the log file similar to the normal redis.conf:
/var/log/redis/sentinel-<instancename>.log
/var/run/redis/sentinel-<instancename>.pid
The unit file checks for the pid file so please adapt your
local sentinel configs.
Changed: redis-conf.patch
- adapt and restructure README.SUSE
- move the LimitNoFile to the service file itself so the user
do not have to manually do that step for every instance
- move the apache integration into its own section
- add section for redis-sentinel
- install sentinel example config with group write permissions
to indicate that the actually config needs to be writable.
OBS-URL: https://build.opensuse.org/request/show/633784
OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=120
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
Index: redis.conf
|
|
===================================================================
|
|
--- redis.conf.orig
|
|
+++ redis.conf
|
|
@@ -133,7 +133,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.
|
|
-daemonize no
|
|
+daemonize yes
|
|
|
|
# If you run Redis from upstart or systemd, Redis can interact with your
|
|
# supervision tree. Options:
|
|
@@ -144,7 +144,7 @@ daemonize no
|
|
# UPSTART_JOB or NOTIFY_SOCKET environment variables
|
|
# Note: these supervision methods only signal "process is ready."
|
|
# They do not enable continuous liveness pings back to your supervisor.
|
|
-supervised no
|
|
+supervised systemd
|
|
|
|
# If a pid file is specified, Redis writes it where specified at startup
|
|
# and removes it at exit.
|
|
@@ -155,7 +155,7 @@ supervised no
|
|
#
|
|
# 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_6379.pid
|
|
+pidfile /var/run/redis/default.pid
|
|
|
|
# Specify the server verbosity level.
|
|
# This can be one of:
|
|
@@ -168,7 +168,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.
|
|
@@ -260,7 +261,7 @@ dbfilename dump.rdb
|
|
# 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 #################################
|
|
|
|
Index: sentinel.conf
|
|
===================================================================
|
|
--- sentinel.conf.orig
|
|
+++ sentinel.conf
|
|
@@ -1,4 +1,8 @@
|
|
# Example sentinel.conf
|
|
+#
|
|
+pidfile /var/run/redis/sentinel-default.pid
|
|
+loglevel notice
|
|
+logfile /var/log/redis/sentinel-default.log
|
|
|
|
# *** IMPORTANT ***
|
|
#
|
|
@@ -202,4 +206,3 @@ sentinel failover-timeout mymaster 18000
|
|
# to get the program executed.
|
|
|
|
sentinel deny-scripts-reconfig yes
|
|
-
|