From 8673363921103c81dd0681b49fa37a134eb55821 Mon Sep 17 00:00:00 2001
From: Brian Witt <brianwitt@gmail.com>
Date: Tue, 4 Nov 2025 21:38:13 -0800
Subject: [PATCH] convert sentinel.conf template to epp

---
 REFERENCE.md                      |  2 +-
 manifests/sentinel.pp             |  6 +--
 templates/redis-sentinel.conf.epp | 76 +++++++++++++++++++++++++++++++
 templates/redis-sentinel.conf.erb | 75 ------------------------------
 4 files changed, 79 insertions(+), 80 deletions(-)
 create mode 100644 templates/redis-sentinel.conf.epp
 delete mode 100644 templates/redis-sentinel.conf.erb

diff --git a/REFERENCE.md b/REFERENCE.md
index 28555622..48b63b25 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1610,7 +1610,7 @@ Data type: `String[1]`
 
 Define which template to use.
 
-Default value: `'redis/redis-sentinel.conf.erb'`
+Default value: `'redis/redis-sentinel.conf.epp'`
 
 ##### <a name="-redis--sentinel--daemonize"></a>`daemonize`
 
diff --git a/manifests/sentinel.pp b/manifests/sentinel.pp
index 1dbd5aff..0ca8540c 100644
--- a/manifests/sentinel.pp
+++ b/manifests/sentinel.pp
@@ -164,7 +164,7 @@
   Stdlib::Absolutepath $config_file = $redis::params::sentinel_config_file,
   Stdlib::Absolutepath $config_file_orig = $redis::params::sentinel_config_file_orig,
   Stdlib::Filemode $config_file_mode = '0644',
-  String[1] $conf_template = 'redis/redis-sentinel.conf.erb',
+  String[1] $conf_template = 'redis/redis-sentinel.conf.epp',
   Boolean $daemonize = $redis::params::sentinel_daemonize,
   Boolean $protected_mode = true,
   Integer[1] $down_after = 30000,
@@ -224,14 +224,12 @@
   }
   Package[$package_name] -> File[$config_file_orig]
 
-  $sentinel_bind_arr = delete_undef_values([$sentinel_bind].flatten)
-
   file { $config_file_orig:
     ensure  => file,
     owner   => $service_user,
     group   => $service_group,
     mode    => $config_file_mode,
-    content => template($conf_template),
+    content => epp($conf_template),
   }
 
   exec { "cp -p ${config_file_orig} ${config_file}":
diff --git a/templates/redis-sentinel.conf.epp b/templates/redis-sentinel.conf.epp
new file mode 100644
index 00000000..b27570f1
--- /dev/null
+++ b/templates/redis-sentinel.conf.epp
@@ -0,0 +1,76 @@
+<%# THIS FILE IS MANAGED BY PUPPET -%>
+<% if $redis::sentinel::sentinel_bind { -%>
+bind <%= [$redis::sentinel::sentinel_bind].flatten.join(' ') %>
+<%- } -%>
+port <%= $redis::sentinel::sentinel_port %>
+<% if $redis::sentinel::sentinel_tls_port { -%>
+tls-port <%= $redis::sentinel::sentinel_tls_port %>
+<%- } -%>
+dir <%= $redis::sentinel::working_dir %>
+daemonize <%= $redis::sentinel::daemonize ? { true => 'yes', false => 'no' } %>
+supervised auto
+pidfile <%= $redis::sentinel::pid_file %>
+protected-mode <%= $redis::sentinel::protected_mode ? { true => 'yes', false => 'no' } %>
+
+<% if $redis::sentinel::sentinel_auth_user { -%>
+sentinel sentinel-user <%= $redis::sentinel::sentinel_auth_user %>
+<%- } -%>
+<% if $redis::sentinel::sentinel_auth_pass { -%>
+sentinel sentinel-pass <%= $redis::sentinel::sentinel_auth_pass.unwrap %>
+
+<%- } -%>
+<% if $redis::sentinel::sentinel_announce_hostnames { -%>
+sentinel announce-hostnames <%= $redis::sentinel::sentinel_announce_hostnames %>
+<%- } -%>
+<% if $redis::sentinel::sentinel_announce_ip { -%>
+sentinel announce-ip <%= $redis::sentinel::sentinel_announce_ip %>
+<%- } -%>
+<% if $redis::sentinel::sentinel_announce_port { -%>
+sentinel announce-port <%= $redis::sentinel::sentinel_announce_port %>
+<%- } -%>
+<% if $redis::sentinel::sentinel_resolve_hostnames { -%>
+sentinel resolve-hostnames <%= $redis::sentinel::sentinel_resolve_hostnames %>
+<%- } -%>
+sentinel monitor <%= $redis::sentinel::master_name %> <%= $redis::sentinel::redis_host %> <%= $redis::sentinel::redis_port %> <%= $redis::sentinel::quorum %>
+sentinel down-after-milliseconds <%= $redis::sentinel::master_name %> <%= $redis::sentinel::down_after %>
+sentinel parallel-syncs <%= $redis::sentinel::master_name %> <%= $redis::sentinel::parallel_sync %>
+sentinel failover-timeout <%= $redis::sentinel::master_name %> <%= $redis::sentinel::failover_timeout %>
+<% if $redis::sentinel::auth_pass { -%>
+sentinel auth-pass <%= $redis::sentinel::master_name %> <%= $redis::sentinel::auth_pass.unwrap %>
+<%- } -%>
+<% if $redis::sentinel::notification_script { -%>
+sentinel notification-script <%= $redis::sentinel::master_name %> <%= $redis::sentinel::notification_script %>
+<%- } -%>
+<% if $redis::sentinel::client_reconfig_script { -%>
+sentinel client-reconfig-script <%= $redis::sentinel::master_name %> <%= $redis::sentinel::client_reconfig_script %>
+<%- } -%>
+<% if $redis::sentinel::requirepass { -%>
+requirepass <%= $redis::sentinel::requirepass %>
+<%- } -%>
+<% if $redis::sentinel::sentinel_tls_port { -%>
+
+tls-cert-file <%= $redis::sentinel::tls_cert_file %>
+tls-key-file <%= $redis::sentinel::tls_key_file %>
+<% if $redis::sentinel::tls_key_file_pass { -%>
+tls-key-file-pass <%= $redis::sentinel::tls_key_file_pass.unwrap %>
+<%- } -%>
+<% if $redis::sentinel::tls_ca_cert_file { -%>
+tls-ca-cert-file <%= $redis::sentinel::tls_ca_cert_file %>
+<%- } -%>
+<% if $redis::sentinel::tls_ca_cert_dir { -%>
+tls-ca-cert-dir <%= $redis::sentinel::tls_ca_cert_dir %>
+<%- } -%>
+tls-auth-clients <%= $redis::sentinel::tls_auth_clients %>
+<% if $redis::sentinel::tls_replication { -%>
+tls-replication <%= $redis::sentinel::tls_replication ? { true => 'yes', false => 'no' } %>
+<%- } -%>
+<%- } -%>
+
+loglevel <%= $redis::sentinel::log_level %>
+logfile <%= $redis::sentinel::log_file %>
+<% unless $redis::sentinel::acls.empty { -%>
+
+<% $redis::sentinel::acls.each |$acl| { -%>
+<%= $acl %>
+<%- } -%>
+<%- } -%>
diff --git a/templates/redis-sentinel.conf.erb b/templates/redis-sentinel.conf.erb
deleted file mode 100644
index a77141ba..00000000
--- a/templates/redis-sentinel.conf.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<% unless @sentinel_bind_arr.empty? -%>
-bind <%= @sentinel_bind_arr.join(' ') %>
-<% end -%>
-port <%= @sentinel_port %>
-<% if @sentinel_tls_port -%>
-tls-port <%= @sentinel_tls_port %>
-<% end -%>
-dir <%= @working_dir %>
-daemonize <%= @daemonize ? 'yes' : 'no' %>
-supervised auto
-pidfile <%= @pid_file %>
-protected-mode <%= @protected_mode ? 'yes' : 'no' %>
-<% if @sentinel_auth_user -%>
-
-sentinel sentinel-user <%= @sentinel_auth_user %>
-<% end -%>
-<% if @sentinel_auth_pass -%>
-sentinel sentinel-pass <%= @sentinel_auth_pass %>
-<% end -%>
-
-<% if @sentinel_announce_hostnames -%>
-sentinel announce-hostnames <%= @sentinel_announce_hostnames %>
-<% end -%>
-<% if @sentinel_announce_ip -%>
-sentinel announce-ip <%= @sentinel_announce_ip %>
-<% end -%>
-<% if @sentinel_announce_port -%>
-sentinel announce-port <%= @sentinel_announce_port %>
-<% end -%>
-<% if @sentinel_resolve_hostnames -%>
-sentinel resolve-hostnames <%= @sentinel_resolve_hostnames %>
-<% end -%>
-sentinel monitor <%= @master_name %> <%= @redis_host %> <%= @redis_port %> <%= @quorum %>
-sentinel down-after-milliseconds <%= @master_name %> <%= @down_after %>
-sentinel parallel-syncs <%= @master_name %> <%= @parallel_sync %>
-sentinel failover-timeout <%= @master_name %> <%= @failover_timeout %>
-<% if @auth_pass_unsensitive -%>
-sentinel auth-pass <%= @master_name %> <%= @auth_pass_unsensitive %>
-<% end -%>
-<% if @notification_script -%>
-sentinel notification-script <%= @master_name %> <%= @notification_script %>
-<% end -%>
-<% if @client_reconfig_script -%>
-sentinel client-reconfig-script <%= @master_name %> <%= @client_reconfig_script %>
-<% end -%>
-<% if @requirepass -%>
-requirepass <%= @requirepass %>
-<% end -%>
-<% if @sentinel_tls_port -%>
-
-tls-cert-file <%= @tls_cert_file %>
-tls-key-file <%= @tls_key_file %>
-<% if @tls_key_file_pass -%>
-tls-key-file-pass <%= @tls_key_file_pass %>
-<% end -%>
-<% if @tls_ca_cert_file -%>
-tls-ca-cert-file <%= @tls_ca_cert_file %>
-<% end -%>
-<% if @tls_ca_cert_dir -%>
-tls-ca-cert-dir <%= @tls_ca_cert_dir %>
-<% end -%>
-tls-auth-clients <%= @tls_auth_clients %>
-<% if @tls_replication -%>
-tls-replication <%= @tls_replication ? 'yes' : 'no' %>
-<% end -%>
-<% end -%>
-
-loglevel <%= @log_level %>
-logfile <%= @log_file %>
-<% unless @acls.empty? -%>
-
-<%   @acls.each do |acl| -%>
-<%= acl %>
-<%   end -%>
-<% end -%>