Skip to content

Commit 7c4cdba

Browse files
committed
Ensure mod::expires is added when needed
1 parent 8ebb118 commit 7c4cdba

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

manifests/vhost.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,10 @@
23402340
include apache::mod::dir
23412341
}
23422342

2343+
if 'expires_active' in $directory {
2344+
include apache::mod::expires
2345+
}
2346+
23432347
if 'gssapi' in $directory {
23442348
include apache::mod::auth_gssapi
23452349
}

spec/defines/vhost_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2205,6 +2205,23 @@
22052205
it { is_expected.to compile }
22062206
it { is_expected.to contain_class('apache::mod::dir') }
22072207
end
2208+
2209+
context 'mod_expires is included when needed' do
2210+
let :params do
2211+
{
2212+
'docroot' => '/var/www/foo',
2213+
'directories' => [
2214+
{
2215+
'expires_active' => 'On',
2216+
},
2217+
]
2218+
2219+
}
2220+
end
2221+
2222+
it { is_expected.to compile }
2223+
it { is_expected.to contain_class('apache::mod::expires') }
2224+
end
22082225
end
22092226
end
22102227
end

0 commit comments

Comments
 (0)