diff --git a/manifests/backup/mysqlbackup.pp b/manifests/backup/mysqlbackup.pp index 24fc99ad7..046be52bd 100644 --- a/manifests/backup/mysqlbackup.pp +++ b/manifests/backup/mysqlbackup.pp @@ -101,12 +101,10 @@ mode => '0600', } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, } - } diff --git a/manifests/backup/mysqldump.pp b/manifests/backup/mysqldump.pp index 96f821831..4f0895cbc 100644 --- a/manifests/backup/mysqldump.pp +++ b/manifests/backup/mysqldump.pp @@ -70,12 +70,10 @@ content => template('mysql/mysqlbackup.sh.erb'), } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, } - } diff --git a/manifests/backup/xtrabackup.pp b/manifests/backup/xtrabackup.pp index 839dbff26..2542550a1 100644 --- a/manifests/backup/xtrabackup.pp +++ b/manifests/backup/xtrabackup.pp @@ -67,9 +67,8 @@ require => Package[$xtrabackup_package_name], } - file { 'mysqlbackupdir': + file { $backupdir: ensure => 'directory', - path => $backupdir, mode => $backupdirmode, owner => $backupdirowner, group => $backupdirgroup, diff --git a/spec/classes/mysql_server_backup_spec.rb b/spec/classes/mysql_server_backup_spec.rb index 5997883a7..3f2751f73 100644 --- a/spec/classes/mysql_server_backup_spec.rb +++ b/spec/classes/mysql_server_backup_spec.rb @@ -15,7 +15,7 @@ class { 'mysql::server': } let(:default_params) do { 'backupuser' => 'testuser', 'backuppassword' => 'testpass', - 'backupdir' => '/tmp', + 'backupdir' => '/tmp/mysql-backup', 'backuprotate' => '25', 'delete_before_dump' => true, 'execpath' => '/usr/bin:/usr/sbin:/bin:/sbin:/opt/zimbra/bin', @@ -65,8 +65,7 @@ class { 'mysql::server': } } it { - is_expected.to contain_file('mysqlbackupdir').with( - path: '/tmp', + is_expected.to contain_file('/tmp/mysql-backup').with( ensure: 'directory', ) } @@ -113,10 +112,11 @@ class { 'mysql::server': } end it { - is_expected.to contain_file('mysqlbackupdir').with( - path: '/tmp', ensure: 'directory', - mode: '0750', owner: 'testuser', - group: 'testgrp' + is_expected.to contain_file('/tmp/mysql-backup').with( + ensure: 'directory', + mode: '0750', + owner: 'testuser', + group: 'testgrp', ) } end