From 76019cb9641de09e8899c75d439397e0ffa3502e Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Fri, 10 Dec 2021 21:48:40 +0100
Subject: [PATCH] make workdir_owner and group a parameter

---
 manifests/config.pp | 4 ++--
 manifests/init.pp   | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index fc3b6d61..35f6fbcc 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -21,9 +21,9 @@
 
   file { $redis::workdir:
     ensure => directory,
-    group  => $redis::service_group,
+    group  => pick($redis::workdir_group, $redis::service_group),
     mode   => $redis::workdir_mode,
-    owner  => $redis::service_user,
+    owner  => pick($redis::workdir_owner, $redis::service_user),
   }
 
   if $redis::default_install {
diff --git a/manifests/init.pp b/manifests/init.pp
index f9d55d33..f428bded 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -235,6 +235,10 @@
 #   above using the 'dbfilename' configuration directive.
 # @param workdir_mode
 #   Adjust mode for data directory.
+# @param workdir_group
+#   Adjust filesystem group for $workdir.
+# @param workdir_owner
+#   Adjust filesystem owner for $workdir.
 # @param zset_max_ziplist_entries
 #   Set max entries for sorted sets.
 # @param zset_max_ziplist_value
@@ -363,6 +367,8 @@
   Boolean $ulimit_managed                                        = true,
   Stdlib::Absolutepath $workdir                                  = $redis::params::workdir,
   Stdlib::Filemode $workdir_mode                                 = '0750',
+  Optional[String[1]] $workdir_group                             = undef,
+  Optional[String[1]] $workdir_owner                             = undef,
   Integer[0] $zset_max_ziplist_entries                           = 128,
   Integer[0] $zset_max_ziplist_value                             = 64,
   Boolean $cluster_enabled                                       = false,