X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/0154acdc57bd73f0a7f8afe2cecc890679ee97ff..b3fad521cc3752b48fdf43c10237527ea2a99d5b:/redis.conf

diff --git a/redis.conf b/redis.conf
index a7ec36a0..9bf1974b 100644
--- a/redis.conf
+++ b/redis.conf
@@ -64,9 +64,16 @@ databases 16
 # another Redis server. Note that the configuration is local to the slave
 # so for example it is possible to configure the slave to save the DB with a
 # different interval, or to listen to another port, and so on.
-
+#
 # slaveof <masterip> <masterport>
 
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
 ################################## SECURITY ###################################
 
 # Require clients to issue AUTH <PASSWORD> before processing any other
@@ -75,7 +82,7 @@ databases 16
 #
 # 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
 
 ################################### LIMITS ####################################
@@ -85,7 +92,7 @@ databases 16
 # is able to open. The special value '0' means no limts.
 # Once the limit is reached Redis will close all the new connections sending
 # an error 'max number of clients reached'.
-
+#
 # maxclients 128
 
 # Don't use more memory than the specified amount of bytes.
@@ -104,7 +111,7 @@ databases 16
 # it is going to use too much memory in the long run, and you'll have the time
 # to upgrade. With maxmemory after the limit is reached you'll start to get
 # errors for write operations, and this may even lead to DB inconsistency.
-
+#
 # maxmemory <bytes>
 
 ############################## APPEND ONLY MODE ###############################
@@ -124,9 +131,9 @@ databases 16
 #
 # The name of the append only file is "appendonly.log"
 
-# appendonly yes
+appendonly no
 
-# The fsync() calls tells the Operating System to actually write data on disk
+# The fsync() call tells the Operating System to actually write data on disk
 # instead to wait for more data in the output buffer. Some OS will really flush 
 # data on disk, some other OS will just try to do it ASAP.
 #
@@ -136,12 +143,15 @@ databases 16
 # always: fsync after every write to the append only log . Slow, Safest.
 # everysec: fsync only if one second passed since the last fsync. Compromise.
 #
-# The default is "no" since it's faster and anyway safer than snapshots from
-# the point of view of durability of the latest records modified.
+# The default is "always" that's the safer of the options. It's up to you to
+# understand if you can relax this to "everysec" that will fsync every second
+# or to "no" that will let the operating system flush the output buffer when
+# it want, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting).
 
-appendfsync no
-# appendfsync always
+appendfsync always
 # appendfsync everysec
+# appendfsync no
 
 ############################### ADVANCED CONFIG ###############################