diff --git a/manifests/config.pp b/manifests/config.pp index 82054281..fd6ff590 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -48,9 +48,9 @@ 'Debian': { file { '/etc/default/redis-server': ensure => file, - group => $redis::config_group, - mode => $redis::config_file_mode, - owner => $redis::config_owner, + group => pick($redis::debdefault_group, $redis::config_group), + mode => pick($redis::debdefault_file_mode, $redis::config_file_mode), + owner => pick($redis::debdefault_owner, $redis::config_owner), } } diff --git a/manifests/init.pp b/manifests/init.pp index 312caeb3..076d2577 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -267,6 +267,15 @@ # Adjust filesystem group for $workdir. # @param workdir_owner # Adjust filesystem owner for $workdir. +# @param debdefault_group +# group of /etc/defaults/redis on Debian systems +# if undef, $redis::config_group is taken +# @param debdefault_file_mode +# filemode of /etc/defaults/redis on Debian systems +# if undef, $redis::config_file_mode is taken +# @param debdefault_owner +# owner of /etc/defaults/redis on Debian systems +# if undef, $redis::config_owner is taken # @param zset_max_ziplist_entries # Set max entries for sorted sets. # @param zset_max_ziplist_value @@ -461,6 +470,9 @@ Stdlib::Filemode $workdir_mode = '0750', Optional[String[1]] $workdir_group = undef, Optional[String[1]] $workdir_owner = undef, + Optional[String[1]] $debdefault_group = undef, + Optional[Stdlib::Filemode] $debdefault_file_mode = undef, + Optional[String[1]] $debdefault_owner = undef, Integer[0] $zset_max_ziplist_entries = 128, Integer[0] $zset_max_ziplist_value = 64, Boolean $cluster_enabled = false,