Skip to content

Commit 82cdf26

Browse files
committed
Add purge and recurse options to the include directory creation when MariaDB package.
1 parent d230e80 commit 82cdf26

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

manifests/server/config.pp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@
8686
if $includedir == undef or $includedir == '' or
8787
($configparentdir != $includedir and $configparentdir != dirname($includedir)) {
8888
file { $configparentdir:
89-
ensure => directory,
90-
mode => '0755',
89+
ensure => directory,
90+
mode => '0755',
91+
recurse => $mysql::server::purge_conf_dir,
92+
purge => $mysql::server::purge_conf_dir,
9193
}
9294
}
9395
}

spec/classes/mycnf_template_spec.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,18 @@
7777
end
7878

7979
context 'with includedir' do
80-
let(:params) { { includedir: '/etc/my.cnf.d' } }
80+
let(:params) do
81+
{
82+
includedir: '/etc/my.cnf.d',
83+
recurse: true,
84+
purge: true
85+
}
86+
end
8187

82-
it 'makes the directory' do
88+
it 'makes the directory with correct recurse and purge values' do
8389
expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
90+
recurse: true,
91+
purge: true,
8492
mode: '0755')
8593
end
8694

0 commit comments

Comments
 (0)