From 96f2d9814da6a5c89c6f1e1255a60062a5a940dd Mon Sep 17 00:00:00 2001
From: Michael Boutillier <michael.boutillier@ingenico.com>
Date: Fri, 7 Mar 2025 14:44:01 +0100
Subject: [PATCH 1/2] fix(template): make my.cg template local t module instead
 of using the one from mysql + move to epp

---
 manifests/cluster/galera_config.pp |  7 ++++++-
 templates/config/my.cnf.epp        | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 templates/config/my.cnf.epp

diff --git a/manifests/cluster/galera_config.pp b/manifests/cluster/galera_config.pp
index ced45fb..49fe1f0 100644
--- a/manifests/cluster/galera_config.pp
+++ b/manifests/cluster/galera_config.pp
@@ -52,11 +52,16 @@
     -> File["${mariadb::cluster::config_dir}/cluster.cnf"]
   }
 
+  $parameters= {
+    'options' => $options,
+    'includedir' => $includedir,
+  }
+
   file { "${mariadb::cluster::config_dir}/cluster.cnf":
     ensure  => file,
     owner   => $mariadb::cluster::user,
     group   => $mysql::params::root_group,
     mode    => '0600',
-    content => template('mysql/my.cnf.erb'),
+    content => epp('mariadb/config/my.cnf.epp',$parameters),
   }
 }
diff --git a/templates/config/my.cnf.epp b/templates/config/my.cnf.epp
new file mode 100644
index 0000000..7371164
--- /dev/null
+++ b/templates/config/my.cnf.epp
@@ -0,0 +1,25 @@
+### MANAGED BY PUPPET ###
+
+<% sort($options.map |$key, $value| { [$key, $value] }).map |$v| { -%>
+<% if type($v[1]) =~ Type[Hash] { -%>
+[<%= $v[0] %>]
+<%sort($v[1].map |$key, $value| { [$key, $value] }).map |$vi| { -%>
+<%- if ($vi[0] == 'ssl-disable') or ($vi[0] =~ /^ssl/ and $v[1]['ssl-disable'] == true) or ($vi[0] =~ /^ssl-/ and $v[1]['ssl'] == false) { -%>
+<%- next -%>
+<%- } elsif $vi[1] == true or $vi[1] == '' { -%>
+<%= $vi[0] -%>
+<%- } elsif type($vi[1]) =~ Type[Array] { -%>
+<%- $vi[1].each |$vii| { -%>
+<%-$base = $vi[0]-%>
+<%= $base %> = <%= $vii %>
+<%- } -%>
+<%- } elsif !($vi[1] ==nil or $vi[1]=='' or $vi[1]==undef) { -%>
+<%-$base = $vi[0]-%>
+<%= $base %> = <%= $vi[1] -%>
+<% } %>
+<% } %>
+<% } %>
+<% } %>
+<% if $includedir and $includedir != '' { -%>
+!includedir <%= $includedir %>
+<% } -%>

From b24b4767e1496254f06938fb4f17c12c1595789a Mon Sep 17 00:00:00 2001
From: Michael Boutillier <michael.boutillier@ingenico.com>
Date: Fri, 7 Mar 2025 15:03:16 +0100
Subject: [PATCH 2/2] fix(warning): use explicit stdlib to remove warning

---
 manifests/cluster/galera_config.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/cluster/galera_config.pp b/manifests/cluster/galera_config.pp
index 49fe1f0..a1baaaa 100644
--- a/manifests/cluster/galera_config.pp
+++ b/manifests/cluster/galera_config.pp
@@ -47,7 +47,7 @@
     Package['percona-xtrabackup', 'socat']
     -> File["${mariadb::cluster::config_dir}/cluster.cnf"]
   } elsif $mariadb::cluster::wsrep_sst_method == 'mariabackup' {
-    ensure_packages([$mariadb::cluster::backup_package_name, 'socat'])
+    stdlib::ensure_packages([$mariadb::cluster::backup_package_name, 'socat'], { 'ensure' => 'present' })
     Package[$mariadb::cluster::backup_package_name, 'socat']
     -> File["${mariadb::cluster::config_dir}/cluster.cnf"]
   }