Skip to content

Commit b23664e

Browse files
committed
Ensure mod::dav is added when needed
1 parent 3b0b094 commit b23664e

File tree

2 files changed

+45
-0
lines changed

2 files changed

+45
-0
lines changed

manifests/vhost.pp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2336,6 +2336,15 @@
23362336
include apache::mod::authz_groupfile
23372337
}
23382338

2339+
if 'dav' in $directory {
2340+
include apache::mod::dav
2341+
if $directory['dav'] == 'On' {
2342+
include apache::mod::dav_fs
2343+
} elsif $directory['dav'] == 'svn' {
2344+
include apache::mod::dav_svn
2345+
}
2346+
}
2347+
23392348
if 'directoryindex' in $directory {
23402349
include apache::mod::dir
23412350
}

spec/defines/vhost_spec.rb

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2222,6 +2222,42 @@
22222222
it { is_expected.to compile }
22232223
it { is_expected.to contain_class('apache::mod::expires') }
22242224
end
2225+
2226+
context 'mod_dav is included when on' do
2227+
let :params do
2228+
{
2229+
'docroot' => '/var/www/foo',
2230+
'directories' => [
2231+
{
2232+
'dav' => 'On',
2233+
},
2234+
]
2235+
2236+
}
2237+
end
2238+
2239+
it { is_expected.to compile }
2240+
it { is_expected.to contain_class('apache::mod::dav') }
2241+
it { is_expected.to contain_class('apache::mod::dav_fs') }
2242+
end
2243+
2244+
context 'mod_dav is included when set to svn' do
2245+
let :params do
2246+
{
2247+
'docroot' => '/var/www/foo',
2248+
'directories' => [
2249+
{
2250+
'dav' => 'svn',
2251+
},
2252+
]
2253+
2254+
}
2255+
end
2256+
2257+
it { is_expected.to compile }
2258+
it { is_expected.to contain_class('apache::mod::dav') }
2259+
it { is_expected.to contain_class('apache::mod::dav_svn') }
2260+
end
22252261
end
22262262
end
22272263
end

0 commit comments

Comments
 (0)