dict.c modified to be able to handle more than 150,000,000 keys

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 803e3ec1a714138249d3e1e0145b7883486381ab..38592b02e6bc3c49c44fd717f4604d475456950f 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -34,6 +34,9 @@ save 900 1
 save 300 10
 save 60 10000
 
+# The filename where to dump the DB
+dbfilename dump.rdb
+
 # For default save/load DB in/from the working directory
 # Note that you must specify a directory not a file name.
 dir ./
@@ -50,7 +53,9 @@ loglevel debug
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile stdout
 
-# Set the number of databases.
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
 databases 16
 
 ################################# REPLICATION #################################
@@ -62,6 +67,17 @@ databases 16
 
 # slaveof <masterip> <masterport>
 
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a