Skip to content

Commit ded4d0b

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

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@
8181

8282
it 'makes the directory' do
8383
expect(subject).to contain_file('/etc/my.cnf.d').with(ensure: :directory,
84+
recurse: false,
85+
purge: false,
8486
mode: '0755')
8587
end
8688

@@ -92,6 +94,8 @@
9294

9395
it 'shouldnt contain the directory' do
9496
expect(subject).not_to contain_file('mysql-config-file').with(ensure: :directory,
97+
recurse: false,
98+
purge: false,
9599
mode: '0755')
96100
end
97101

0 commit comments

Comments
 (0)