diff modules/mysql/manifests/backup/mysqlbackup.pp @ 478:adf6fe9bbc17

Update Puppet modules to latest versions
author IBBoard <dev@ibboard.co.uk>
date Thu, 29 Aug 2024 18:47:29 +0100
parents c6c9a2cfcfbd
children
line wrap: on
line diff
--- a/modules/mysql/manifests/backup/mysqlbackup.pp	Tue Aug 27 13:35:17 2024 +0100
+++ b/modules/mysql/manifests/backup/mysqlbackup.pp	Thu Aug 29 18:47:29 2024 +0100
@@ -40,7 +40,7 @@
   }
   mysql_user { "${backupuser}@localhost":
     ensure        => $ensure,
-    password_hash => mysql::password($backuppassword),
+    password_hash => Deferred('mysql::password', [$backuppassword]),
     require       => Class['mysql::server::root_password'],
   }
 
@@ -75,9 +75,9 @@
 
   if $install_cron {
     if $facts['os']['family'] == 'RedHat' {
-      ensure_packages('cronie')
+      stdlib::ensure_packages('cronie')
     } elsif $facts['os']['family'] != 'FreeBSD' {
-      ensure_packages('cron')
+      stdlib::ensure_packages('cron')
     }
   }
 
@@ -108,14 +108,14 @@
       'incremental_base'       => 'history:last_backup',
       'incremental_backup_dir' => $backupdir,
       'user'                   => $backupuser,
-      'password'               => $backuppassword_unsensitive,
+      'password'               => Deferred('mysql::password', [$backuppassword_unsensitive]),
     },
   }
   $options = mysql::normalise_and_deepmerge($default_options, $mysql::server::override_options)
 
   file { 'mysqlbackup-config-file':
     path    => '/etc/mysql/conf.d/meb.cnf',
-    content => template('mysql/meb.cnf.erb'),
+    content => stdlib::deferrable_epp('mysql/meb.cnf.epp', { 'options' => $options }),
     mode    => '0600',
   }