Skip to content

Commit 8ebb118

Browse files
committed
Ensure mod::dir is added when needed
1 parent 1c72075 commit 8ebb118

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

manifests/vhost.pp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,6 +2300,7 @@
23002300
}
23012301

23022302
if $fallbackresource {
2303+
include apache::mod::dir
23032304
$fall_back_res_params = {
23042305
'fallbackresource' => $fallbackresource,
23052306
}
@@ -2335,6 +2336,10 @@
23352336
include apache::mod::authz_groupfile
23362337
}
23372338

2339+
if 'directoryindex' in $directory {
2340+
include apache::mod::dir
2341+
}
2342+
23382343
if 'gssapi' in $directory {
23392344
include apache::mod::auth_gssapi
23402345
}

spec/defines/vhost_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,6 +2188,23 @@
21882188
}
21892189
end
21902190
end
2191+
2192+
context 'mod_dir is included when needed' do
2193+
let :params do
2194+
{
2195+
'docroot' => '/var/www/foo',
2196+
'directories' => [
2197+
{
2198+
'directoryindex' => 'index.php',
2199+
},
2200+
]
2201+
2202+
}
2203+
end
2204+
2205+
it { is_expected.to compile }
2206+
it { is_expected.to contain_class('apache::mod::dir') }
2207+
end
21912208
end
21922209
end
21932210
end

0 commit comments

Comments
 (0)