From bf26e9866d2fcb4eab73f03740867007fe02458e Mon Sep 17 00:00:00 2001 From: Infraded Date: Sun, 2 Aug 2015 13:00:03 -0700 Subject: [PATCH 1/6] Added options for unixsocket to manifest --- manifests/server.pp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manifests/server.pp b/manifests/server.pp index b88948e..31d3bad 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -12,6 +12,10 @@ # Listen IP. Default: 127.0.0.1 # [*redis_port*] # Listen port of Redis. Default: 6379 +# [*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_timeout*] @@ -78,6 +82,8 @@ $redis_memory = '100mb', $redis_ip = '127.0.0.1', $redis_port = 6379, + $redis_socket = '/tmp/redis.sock', + $redis_socketperm = 755, $redis_mempolicy = 'allkeys-lru', $redis_timeout = 0, $redis_nr_dbs = 1, From d6ce9b7a313ade213af17263ab425edc2093ad72 Mon Sep 17 00:00:00 2001 From: Infraded Date: Sun, 2 Aug 2015 13:05:31 -0700 Subject: [PATCH 2/6] Added option to enable/disable sockets This prevents unix sockets from being created with defaults if they are not wanted. --- manifests/server.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/server.pp b/manifests/server.pp index 31d3bad..f25c5a7 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -12,6 +12,8 @@ # 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*] @@ -82,6 +84,7 @@ $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', From ef51813919a82200da35bf125ed724b7611e80e6 Mon Sep 17 00:00:00 2001 From: Infraded Date: Sun, 2 Aug 2015 13:08:16 -0700 Subject: [PATCH 3/6] Added options for unixsocket to template Conditional to redis_usesocket --- templates/etc/redis.conf.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/etc/redis.conf.erb b/templates/etc/redis.conf.erb index cacdfcc..32a3616 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 %> From e031374bd10f1b42b3abc9cfc56b0cc2fa01c6e4 Mon Sep 17 00:00:00 2001 From: Infraded Date: Sun, 2 Aug 2015 13:09:34 -0700 Subject: [PATCH 4/6] Added option for memsamples --- manifests/server.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/server.pp b/manifests/server.pp index f25c5a7..211ee7a 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -20,6 +20,8 @@ # 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*] @@ -88,6 +90,7 @@ $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', From f7cb4d948f014a16440d25cfbfe9b70d7d789969 Mon Sep 17 00:00:00 2001 From: Infraded Date: Sun, 2 Aug 2015 13:11:58 -0700 Subject: [PATCH 5/6] Added option for memsamples to template --- templates/etc/redis.conf.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/etc/redis.conf.erb b/templates/etc/redis.conf.erb index 32a3616..d1a5ca5 100644 --- a/templates/etc/redis.conf.erb +++ b/templates/etc/redis.conf.erb @@ -288,6 +288,7 @@ maxmemory-policy <%= @redis_mempolicy %> # using the following configuration directive. # # maxmemory-samples 3 +maxmemory-samples <%= @redis_memsamples %> ############################## APPEND ONLY MODE ############################### From baf40227a1dca29c2dbda2846606e2be741cbaac Mon Sep 17 00:00:00 2001 From: Infraded Date: Sun, 2 Aug 2015 22:12:15 -0700 Subject: [PATCH 6/6] Add unixsocket & memsamples options to readme --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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