Merge pull request #8 from zebzeb/extra_conf_file

add extra config file parameter
voxpupuli · Mar 25, 2014 · d0bb45c · d0bb45c
2 parents 054707c + 1334325
commit d0bb45c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -34,6 +34,7 @@
   $daemonize                   = $::redis::params::daemonize,
   $databases                   = $::redis::params::databases,
   $dbfilename                  = $::redis::params::dbfilename,
+  $extra_config_file           = $::redis::params::extra_config_file,
   $hash_max_ziplist_entries    = $::redis::params::hash_max_ziplist_entries,
   $hash_max_ziplist_value      = $::redis::params::hash_max_ziplist_value,
   $list_max_ziplist_entries    = $::redis::params::list_max_ziplist_entries,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -17,6 +17,7 @@
   $daemonize                   = true
   $databases                   = 16
   $dbfilename                  = 'dump.rdb'
+  $extra_config_file           = undef
   $hash_max_ziplist_entries    = 512
   $hash_max_ziplist_value      = 64
   $list_max_ziplist_entries    = 512

diff --git a/templates/redis.conf.erb b/templates/redis.conf.erb
@@ -541,3 +541,7 @@ client-output-buffer-limit pubsub 32mb 8mb 60
 #
 # include /path/to/local.conf
 # include /path/to/other.conf
+<% if @extra_config_file -%>
+include <%= @extra_config_file %>
+<% end -%>
+