resolving merge conflict

puppetlabs · Apr 12, 2023 · 309de96 · 309de96
1 parent 8c5ba7b
commit 309de96
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/manifests/backup/mysqlbackup.pp b/manifests/backup/mysqlbackup.pp
@@ -6,6 +6,7 @@
 class mysql::backup::mysqlbackup (
   $backupuser               = '',
   Variant[String, Sensitive[String]] $backuppassword = '',
+  $backupcronuser           = $mysql::params::backupcronuser,
   $maxallowedpacket         = '1M',
   $backupdir                = '',
   $backupdirmode            = '0700',
@@ -84,7 +85,7 @@
   cron { 'mysqlbackup-weekly':
     ensure  => $ensure,
     command => 'mysqlbackup backup',
-    user    => 'root',
+    user    => $backupcronuser,
     hour    => $time[0],
     minute  => $time[1],
     weekday => '0',
@@ -94,7 +95,7 @@
   cron { 'mysqlbackup-daily':
     ensure  => $ensure,
     command => 'mysqlbackup --incremental backup',
-    user    => 'root',
+    user    => $backupcronuser,
     hour    => $time[0],
     minute  => $time[1],
     weekday => '1-6',

diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp
@@ -5,6 +5,7 @@
 class mysql::backup::mysqldump (
   $backupuser               = '',
   Variant[String, Sensitive[String]] $backuppassword = '',
+  $backupcronuser           = $mysql::params::backupcronuser,
   $backupdir                = '',
   $maxallowedpacket         = '1M',
   $backupdirmode            = '0700',
@@ -79,7 +80,7 @@
   cron { 'mysql-backup':
     ensure   => $ensure,
     command  => '/usr/local/sbin/mysqlbackup.sh',
-    user     => 'root',
+    user     => $backupcronuser,
     hour     => $time[0],
     minute   => $time[1],
     monthday => $time[2],
@@ -93,7 +94,7 @@
     ensure  => $ensure,
     path    => '/usr/local/sbin/mysqlbackup.sh',
     mode    => '0700',
-    owner   => 'root',
+    owner   => $backupcronuser,
     group   => $mysql::params::root_group,
     content => template('mysql/mysqlbackup.sh.erb'),
   }

diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp
@@ -5,6 +5,7 @@
 class mysql::backup::xtrabackup (
   $backupuser               = undef,
   Optional[Variant[String, Sensitive[String]]] $backuppassword = undef,
+  $backupcronuser           = $mysql::params::backupcronuser,
   $backupdir                = '',
   $maxallowedpacket         = '1M',
   $backupmethod             = 'xtrabackup',
@@ -129,7 +130,7 @@
     cron { 'xtrabackup-weekly':
       ensure  => $ensure,
       command => "/usr/local/sbin/xtrabackup.sh --target-dir=${backupdir}/$(date +\\%F)_full ${additional_cron_args}",
-      user    => 'root',
+      user    => $backupcronuser,
       hour    => $time[0],
       minute  => $time[1],
       weekday => '0',
@@ -161,7 +162,7 @@
   cron { 'xtrabackup-daily':
     ensure  => $ensure,
     command => "/usr/local/sbin/xtrabackup.sh ${daily_cron_data['directories']} ${additional_cron_args}",
-    user    => 'root',
+    user    => $backupcronuser,
     hour    => $time[0],
     minute  => $time[1],
     weekday => $daily_cron_data['weekday'],
@@ -180,7 +181,7 @@
     ensure  => $ensure,
     path    => '/usr/local/sbin/xtrabackup.sh',
     mode    => '0700',
-    owner   => 'root',
+    owner   => $backupcronuser,
     group   => $mysql::params::root_group,
     content => template($backupscript_template),
   }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -6,6 +6,7 @@
 class mysql::params {
   $manage_config_file     = true
   $config_file_mode       = '0644'
+  $backupcronuser         = 'root'
   $purge_conf_dir         = false
   $restart                = false
   $root_password          = 'UNSET'

diff --git a/manifests/server/backup.pp b/manifests/server/backup.pp
@@ -24,6 +24,8 @@
 #
 # @param backupuser
 #   MySQL user to create with backup administrator privileges.
+# @param backupcronuser
+#   User to use for backup cron jobs. Defaults to root.
 # @param backuppassword
 #   Password to create for `backupuser`.
 # @param backupdir
@@ -84,6 +86,7 @@
 #   Give a list of excluded databases when using file_per_database, e.g.: [ 'information_schema', 'performance_schema' ]
 class mysql::server::backup (
   $backupuser               = undef,
+  $backupcronuser           = $mysql::params::backupcronuser,
   Optional[Variant[String, Sensitive[String]]] $backuppassword = undef,
   $backupdir                = undef,
   $backupdirmode            = '0700',
@@ -121,10 +124,11 @@
   create_resources('class', {
       "mysql::backup::${provider}" => {
         'backupuser'               => $backupuser,
+        'backupcronuser'           => $backupcronuser,
         'backuppassword'           => $backuppassword,
         'backupdir'                => $backupdir,
         'backupdirmode'            => $backupdirmode,
-        'backupdirowner'           => $backupdirowner,
+        'backupdirowner'           => $backupcronuser,
         'backupdirgroup'           => $backupdirgroup,
         'backupcompress'           => $backupcompress,
         'backuprotate'             => $backuprotate,