Skip to content

Commit

Permalink
Merge pull request #6 from stissot/unixsocketperm
Browse files Browse the repository at this point in the history
add unix socket permissions attribute
  • Loading branch information
nukemberg committed Jan 21, 2015
2 parents 490f4f0 + 3b38bb3 commit 91777b6
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions templates/default/redis.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,12 @@ bind <%= @conf["bindaddress"] %>
# on a unix socket when not specified.
#
# unixsocket /tmp/redis.sock
# unixsocketperm 700
<% if @conf.has_key? :socket %>
unixsocket <%= @conf["socket"] %>
<% if @conf.has_key? :unixsocketperm %>
unixsocketperm <%= @conf["unixsocketperm"] %>
<% end %>
<% end %>

# Close the connection after a client is idle for N seconds (0 to disable)
Expand Down Expand Up @@ -109,9 +113,9 @@ dbfilename <%= @conf["dumpdb_filename"] %>
#
# The DB will be written inside this directory, with the filename specified
# above using the 'dbfilename' configuration directive.
#
#
# Also the Append Only File will be created inside this directory.
#
#
# Note that you must specify a directory here, not a file name.
dir <%= @conf["data_dir"] %>

Expand Down Expand Up @@ -156,7 +160,7 @@ slave-serve-stale-data yes
#
# This should stay commented out for backward compatibility and because most
# people do not need auth (e.g. they run their own servers).
#
#
# Warning: since Redis is pretty fast an outside user can try up to
# 150k passwords per second against a good box. This means that you should
# use a very strong password otherwise it will be very easy to break.
Expand Down Expand Up @@ -211,14 +215,14 @@ requirepass <%= @conf["requirepass"] %>

# 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)
# noeviction -> don't expire at all, just return an error on write operations
#
#
# Note: with all the kind of policies, Redis will return an error on write
# operations, when there are not suitable keys for eviction.
#
Expand Down Expand Up @@ -268,7 +272,7 @@ appendonly <%= @conf["appendonly"] %>
# appendfilename appendonly.aof

# 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
# 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.
#
# Redis supports three different modes:
Expand Down Expand Up @@ -304,7 +308,7 @@ appendfsync <%= @conf["appendfsync"] %>
# the same as "appendfsync none", that in pratical terms means that it is
# possible to lost up to 30 seconds of log in the worst scenario (with the
# default Linux settings).
#
#
# If you have latency problems turn this to "yes". Otherwise leave it as
# "no" that is the safest pick from the point of view of durability.
no-appendfsync-on-rewrite <%= @conf["no_appendfsync_on_rewrite"] %>
Expand All @@ -328,7 +332,7 @@ vm-enabled <%= @conf["vm"]["enabled"] %>
# file for every redis process you are running. Redis will complain if the
# swap file is already in use.
#
# The best kind of storage for the Redis swap file (that's accessed at random)
# The best kind of storage for the Redis swap file (that's accessed at random)
# is a Solid State Disk (SSD).
#
# *** WARNING *** if you are using a shared hosting the default of putting
Expand Down Expand Up @@ -413,7 +417,7 @@ set-max-intset-entries 512
# that is rhashing, the more rehashing "steps" are performed, so if the
# server is idle the rehashing is never complete and some more memory is used
# by the hash table.
#
#
# The default is to use this millisecond 10 times every second in order to
# active rehashing the main dictionaries, freeing memory when possible.
#
Expand Down

0 comments on commit 91777b6

Please sign in to comment.