diff --git a/README.md b/README.md index 7356e76..31e5216 100644 --- a/README.md +++ b/README.md @@ -230,10 +230,26 @@ Default is '127.0.0.1' (string). Listen IP of redis. Listen port of Redis. Default: 6379 +#####`redis_usesocket` + +To enable unixsocket options. Default: false + +#####`redis_socket` + +Unix socket to use. Default: /tmp/redis.sock + +#####`redis_socketperm` + +Permission of socket file. Default: 755 + #####`redis_mempolicy` Algorithm used to manage keys. See Redis docs for possible values. Default: allkeys-lru +#####`redis_memsamples` + +Number of samples to use for LRU policies. Default: 3 + #####`redis_timeout` Default: 0 diff --git a/manifests/server.pp b/manifests/server.pp index b88948e..211ee7a 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -12,8 +12,16 @@ # Listen IP. Default: 127.0.0.1 # [*redis_port*] # Listen port of Redis. Default: 6379 +# [*redis_usesocket*] +# To enable unixsocket options. Default: false +# [*redis_socket*] +# Unix socket to use. Default: /tmp/redis.sock +# [*redis_socketperm*] +# Permission of socket file. Default: 755 # [*redis_mempolicy*] # Algorithm used to manage keys. See Redis docs for possible values. Default: allkeys-lru +# [*redis_memsamples*] +# Number of samples to use for LRU policies. Default: 3 # [*redis_timeout*] # Default: 0 # [*redis_nr_dbs*] @@ -78,7 +86,11 @@ $redis_memory = '100mb', $redis_ip = '127.0.0.1', $redis_port = 6379, + $redis_usesocket = false, + $redis_socket = '/tmp/redis.sock', + $redis_socketperm = 755, $redis_mempolicy = 'allkeys-lru', + $redis_memsamples = 3, $redis_timeout = 0, $redis_nr_dbs = 1, $redis_dbfilename = 'dump.rdb', diff --git a/templates/etc/redis.conf.erb b/templates/etc/redis.conf.erb index cacdfcc..d1a5ca5 100644 --- a/templates/etc/redis.conf.erb +++ b/templates/etc/redis.conf.erb @@ -36,6 +36,10 @@ bind <%= @redis_ip %> # on a unix socket when not specified. # # unixsocket /var/run/redis/redis.sock +<% if @redis_usesocket -%> +unixsocket <%= @redis_socket %> +unixsocketperm <%= @redis_socketperm %> +<% end -%> # Close the connection after a client is idle for N seconds (0 to disable) timeout <%= @redis_timeout %> @@ -284,6 +288,7 @@ maxmemory-policy <%= @redis_mempolicy %> # using the following configuration directive. # # maxmemory-samples 3 +maxmemory-samples <%= @redis_memsamples %> ############################## APPEND ONLY MODE ###############################