Skip to content

Commit 210f319

Browse files
committed
Include apache::mod::filter in apache::mod::deflate
This was already done in default mods, but this removes duplication and allows use without default mods.
1 parent 176ab02 commit 210f319

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

manifests/default_mods.pp

-9
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@
124124
include apache::mod::setenvif
125125
include apache::mod::auth_basic
126126

127-
# filter is needed by mod_deflate
128-
include apache::mod::filter
129-
130127
# authz_core is needed for 'Require' directive
131128
::apache::mod { 'authz_core':
132129
id => 'authz_core_module',
@@ -145,16 +142,10 @@
145142
::apache::mod { 'authz_core':
146143
id => 'authz_core_module',
147144
}
148-
149-
# filter is needed by mod_deflate
150-
include apache::mod::filter
151145
} else {
152146
# authz_core is needed for 'Require' directive
153147
::apache::mod { 'authz_core':
154148
id => 'authz_core_module',
155149
}
156-
157-
# filter is needed by mod_deflate
158-
include apache::mod::filter
159150
}
160151
}

manifests/mod/deflate.pp

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
}
2525
) {
2626
include apache
27+
include apache::mod::filter
28+
2729
::apache::mod { 'deflate': }
2830

2931
file { 'deflate.conf':

spec/classes/mod/deflate_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# This function is called inside the OS specific contexts
66
def general_deflate_specs
77
it { is_expected.to contain_apache__mod('deflate') }
8+
it { is_expected.to contain_class('apache::mod::filter') }
89

910
expected = "AddOutputFilterByType DEFLATE application/rss+xml\n"\
1011
"AddOutputFilterByType DEFLATE application/x-javascript\n"\

0 commit comments

Comments
 (0)