X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/5d10923f7bc3333b5efaa151ea3b9a4e6ddfe72d..26b3366993f566b438049765d65c51db056fcffa:/redis.conf?ds=inline

diff --git a/redis.conf b/redis.conf
index a01bdd15..36f650ed 100644
--- a/redis.conf
+++ b/redis.conf
@@ -21,7 +21,6 @@ daemonize no
 pidfile /var/run/redis.pid
 
 # Accept connections on the specified port, default is 6379.
-# Use port -1 to disable listening on a network interface.
 port 6379
 
 # If you want you can bind a single interface, if the bind option is not
@@ -126,6 +125,22 @@ dir ./
 #
 # requirepass foobared
 
+# Command renaming.
+#
+# It is possilbe to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# of hard to guess so that it will be still available for internal-use
+# tools but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possilbe to completely kill a command renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+
 ################################### LIMITS ####################################
 
 # Set the max number of connected clients at the same time. By default there
@@ -155,6 +170,25 @@ dir ./
 #
 # maxmemory <bytes>
 
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached? You can select among five behavior:
+# 
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key accordingly to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys->random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+#
+# maxmemory-policy volatile-lru
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can select as well the sample
+# size to check. For instance for default Redis will check three keys and
+# pick the one that was used less recently, you can change the sample size
+# using the following configuration directive.
+#
+# maxmemory-samples 3
+
 ############################## APPEND ONLY MODE ###############################
 
 # By default Redis asynchronously dumps the dataset on disk. If you can live