Skip to content

Commit 9fb67af

Browse files
committed
add include parameter for config
1 parent d809094 commit 9fb67af

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

CHANGELOG.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
- Fix broken systemd part for Debian
66
- Fix cluster coverage error in redis.conf template
77
- Add required update-rc.d headers to debian init.d scripts
8+
- Fix ensure_packages expects an array
89

910
#### Features:
1011

11-
- redis and sentinel: allow turning off protected mode
12-
- Added option to redis.conf: client-output-buffer-limit, as a hash
13-
- Added option to redis.conf: repl_backlog_size, a simple value
12+
- Redis, Sentinel: allow turning off protected mode
13+
- Server: Added option to redis.conf: client-output-buffer-limit, as a hash
14+
- Server: Added option to redis.conf: repl_backlog_size, a simple value
15+
- Server: add include parameter for config
1416
- allows for compatibility with Amazon Linux
1517
- Add cluster params documentation + enable cluster support
1618

manifests/server.pp

+4
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@
115115
# [*cluster_require_full_coverage*]
116116
# By default Redis Cluster nodes stop accepting queries if they detect there
117117
# is at least an hash slot uncovered.
118+
#
119+
# [*include*]
120+
# Array of extra configs to include Example: [ '/etc/redis/local.conf' ]
118121

119122
define redis::server (
120123
$redis_name = $name,
@@ -164,6 +167,7 @@
164167
$cluster_migration_barrier = undef,
165168
$cluster_require_full_coverage = true,
166169
$protected_mode = undef,
170+
$include = [],
167171
) {
168172
$redis_user = $::redis::install::redis_user
169173
$redis_group = $::redis::install::redis_group

templates/etc/redis.conf.erb

+3
Original file line numberDiff line numberDiff line change
@@ -672,3 +672,6 @@ client-output-buffer-limit <%= key -%> <%= value %>
672672
#
673673
# include /path/to/local.conf
674674
# include /path/to/other.conf
675+
<% @include.each do |config| %>
676+
include <%= config %>
677+
<% end %>

0 commit comments

Comments
 (0)