SHA256
1
0
forked from pool/redis
redis/redis-conf.patch

64 lines
2.2 KiB
Diff
Raw Normal View History

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
Accepting request 405637 from home:rmaliska:branches:server:database - Update to 3.2.1 * [FIX] Cleaned up spec file. * [FIX] Critical bug in Sentinel was hopefully fixed. * [FIX] BITFIELD bugs fixed. * [FIX] GEO commands fixes on syntax errors and edge cases. * [NEW] RESOTRE now accepts dumps generated by older Redis versions. * [NEW] Jemalloc now is configured to save you memory, for a problem a change in the jemalloc configuration did not really survived when the 3.2.0 release was finalized. * [NEW] TTL and TYPE command no longer alter the last access time of a key, for LRU evictions purposes. A new TOUCH command was introduced *just* to update the access time of a key. * [FIX] A bug was fixed in redis-cli, that connected to the instance running on the port 6379 if there was one, regardless of what was specified. * [NEW] TCP keep alive is now enabled by default. This should fix most ghost connections problems without resulting in any practical change in otherwise sane deployments. * [FIX] A Sentinel crash that could happen during failovers was fixed. * [NEW] avg_ttl reporting in INFO improved. * [NEW] Sentinel: improve handling of known Sentinel instances. * [NEW] Redis Cluster address update (via gossip section) processing improved to avoid initiating inwanted handshakes. * [FIX] Critical bug fixed: There was a problem in the way a cluster instance loaded the AOF that could cause data written via scripts to be lost during reshardings. * [NEW] There is a new very powerful BITFIELD command. Check the documentation here: http://redis.io/commands/BITFIELD * [NEW] CONFIG GET is allowed during the loading of the dataset. * [NEW] The DEBUG command have new features and can show an help with DEBUG HELP. * [NEW] redis-cli show hits about the commands arguments to the right. OBS-URL: https://build.opensuse.org/request/show/405637 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=78
2016-06-30 12:52:49 +02:00
# If you run Redis from upstart or systemd, Redis can interact with your
# supervision tree. Options:
@@ -144,7 +144,7 @@ daemonize no
Accepting request 405637 from home:rmaliska:branches:server:database - Update to 3.2.1 * [FIX] Cleaned up spec file. * [FIX] Critical bug in Sentinel was hopefully fixed. * [FIX] BITFIELD bugs fixed. * [FIX] GEO commands fixes on syntax errors and edge cases. * [NEW] RESOTRE now accepts dumps generated by older Redis versions. * [NEW] Jemalloc now is configured to save you memory, for a problem a change in the jemalloc configuration did not really survived when the 3.2.0 release was finalized. * [NEW] TTL and TYPE command no longer alter the last access time of a key, for LRU evictions purposes. A new TOUCH command was introduced *just* to update the access time of a key. * [FIX] A bug was fixed in redis-cli, that connected to the instance running on the port 6379 if there was one, regardless of what was specified. * [NEW] TCP keep alive is now enabled by default. This should fix most ghost connections problems without resulting in any practical change in otherwise sane deployments. * [FIX] A Sentinel crash that could happen during failovers was fixed. * [NEW] avg_ttl reporting in INFO improved. * [NEW] Sentinel: improve handling of known Sentinel instances. * [NEW] Redis Cluster address update (via gossip section) processing improved to avoid initiating inwanted handshakes. * [FIX] Critical bug fixed: There was a problem in the way a cluster instance loaded the AOF that could cause data written via scripts to be lost during reshardings. * [NEW] There is a new very powerful BITFIELD command. Check the documentation here: http://redis.io/commands/BITFIELD * [NEW] CONFIG GET is allowed during the loading of the dataset. * [NEW] The DEBUG command have new features and can show an help with DEBUG HELP. * [NEW] redis-cli show hits about the commands arguments to the right. OBS-URL: https://build.opensuse.org/request/show/405637 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=78
2016-06-30 12:52:49 +02:00
# 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
Accepting request 405637 from home:rmaliska:branches:server:database - Update to 3.2.1 * [FIX] Cleaned up spec file. * [FIX] Critical bug in Sentinel was hopefully fixed. * [FIX] BITFIELD bugs fixed. * [FIX] GEO commands fixes on syntax errors and edge cases. * [NEW] RESOTRE now accepts dumps generated by older Redis versions. * [NEW] Jemalloc now is configured to save you memory, for a problem a change in the jemalloc configuration did not really survived when the 3.2.0 release was finalized. * [NEW] TTL and TYPE command no longer alter the last access time of a key, for LRU evictions purposes. A new TOUCH command was introduced *just* to update the access time of a key. * [FIX] A bug was fixed in redis-cli, that connected to the instance running on the port 6379 if there was one, regardless of what was specified. * [NEW] TCP keep alive is now enabled by default. This should fix most ghost connections problems without resulting in any practical change in otherwise sane deployments. * [FIX] A Sentinel crash that could happen during failovers was fixed. * [NEW] avg_ttl reporting in INFO improved. * [NEW] Sentinel: improve handling of known Sentinel instances. * [NEW] Redis Cluster address update (via gossip section) processing improved to avoid initiating inwanted handshakes. * [FIX] Critical bug fixed: There was a problem in the way a cluster instance loaded the AOF that could cause data written via scripts to be lost during reshardings. * [NEW] There is a new very powerful BITFIELD command. Check the documentation here: http://redis.io/commands/BITFIELD * [NEW] CONFIG GET is allowed during the loading of the dataset. * [NEW] The DEBUG command have new features and can show an help with DEBUG HELP. * [NEW] redis-cli show hits about the commands arguments to the right. OBS-URL: https://build.opensuse.org/request/show/405637 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=78
2016-06-30 12:52:49 +02:00
# If a pid file is specified, Redis writes it where specified at startup
# and removes it at exit.
@@ -155,7 +155,7 @@ supervised no
#
Accepting request 405637 from home:rmaliska:branches:server:database - Update to 3.2.1 * [FIX] Cleaned up spec file. * [FIX] Critical bug in Sentinel was hopefully fixed. * [FIX] BITFIELD bugs fixed. * [FIX] GEO commands fixes on syntax errors and edge cases. * [NEW] RESOTRE now accepts dumps generated by older Redis versions. * [NEW] Jemalloc now is configured to save you memory, for a problem a change in the jemalloc configuration did not really survived when the 3.2.0 release was finalized. * [NEW] TTL and TYPE command no longer alter the last access time of a key, for LRU evictions purposes. A new TOUCH command was introduced *just* to update the access time of a key. * [FIX] A bug was fixed in redis-cli, that connected to the instance running on the port 6379 if there was one, regardless of what was specified. * [NEW] TCP keep alive is now enabled by default. This should fix most ghost connections problems without resulting in any practical change in otherwise sane deployments. * [FIX] A Sentinel crash that could happen during failovers was fixed. * [NEW] avg_ttl reporting in INFO improved. * [NEW] Sentinel: improve handling of known Sentinel instances. * [NEW] Redis Cluster address update (via gossip section) processing improved to avoid initiating inwanted handshakes. * [FIX] Critical bug fixed: There was a problem in the way a cluster instance loaded the AOF that could cause data written via scripts to be lost during reshardings. * [NEW] There is a new very powerful BITFIELD command. Check the documentation here: http://redis.io/commands/BITFIELD * [NEW] CONFIG GET is allowed during the loading of the dataset. * [NEW] The DEBUG command have new features and can show an help with DEBUG HELP. * [NEW] redis-cli show hits about the commands arguments to the right. OBS-URL: https://build.opensuse.org/request/show/405637 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=78
2016-06-30 12:52:49 +02:00
# 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
Accepting request 405637 from home:rmaliska:branches:server:database - Update to 3.2.1 * [FIX] Cleaned up spec file. * [FIX] Critical bug in Sentinel was hopefully fixed. * [FIX] BITFIELD bugs fixed. * [FIX] GEO commands fixes on syntax errors and edge cases. * [NEW] RESOTRE now accepts dumps generated by older Redis versions. * [NEW] Jemalloc now is configured to save you memory, for a problem a change in the jemalloc configuration did not really survived when the 3.2.0 release was finalized. * [NEW] TTL and TYPE command no longer alter the last access time of a key, for LRU evictions purposes. A new TOUCH command was introduced *just* to update the access time of a key. * [FIX] A bug was fixed in redis-cli, that connected to the instance running on the port 6379 if there was one, regardless of what was specified. * [NEW] TCP keep alive is now enabled by default. This should fix most ghost connections problems without resulting in any practical change in otherwise sane deployments. * [FIX] A Sentinel crash that could happen during failovers was fixed. * [NEW] avg_ttl reporting in INFO improved. * [NEW] Sentinel: improve handling of known Sentinel instances. * [NEW] Redis Cluster address update (via gossip section) processing improved to avoid initiating inwanted handshakes. * [FIX] Critical bug fixed: There was a problem in the way a cluster instance loaded the AOF that could cause data written via scripts to be lost during reshardings. * [NEW] There is a new very powerful BITFIELD command. Check the documentation here: http://redis.io/commands/BITFIELD * [NEW] CONFIG GET is allowed during the loading of the dataset. * [NEW] The DEBUG command have new features and can show an help with DEBUG HELP. * [NEW] redis-cli show hits about the commands arguments to the right. OBS-URL: https://build.opensuse.org/request/show/405637 OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=78
2016-06-30 12:52:49 +02:00
# 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 ***
#