Skip to content

Commit ca4dd31

Browse files
committed
(maint) FIXUP watchdog
1 parent b70c525 commit ca4dd31

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

manifests/mod/watchdog.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
) {
1111
include apache
1212

13-
apache::mod { 'watchdog':
13+
$module_builtin = $facts['os']['family'] in ['Debian']
14+
15+
unless $module_builtin {
16+
apache::mod { 'watchdog':
17+
}
1418
}
1519

1620
if $watchdog_interval {

spec/classes/mod/watchdog_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
os_facts
1010
end
1111

12-
it { is_expected.to contain_apache__mod('watchdog') }
12+
if os_facts[:os]['family'] == 'Debian'
13+
it { is_expected.not_to contain_apache__mod('watchdog') }
14+
else
15+
it { is_expected.to contain_apache__mod('watchdog') }
16+
end
1317

1418
context 'with default configuration' do
1519
it { is_expected.not_to contain_file('watchdog.conf') }

0 commit comments

Comments
 (0)