File tree Expand file tree Collapse file tree 2 files changed +6
-13
lines changed Expand file tree Collapse file tree 2 files changed +6
-13
lines changed Original file line number Diff line number Diff line change 1855
1855
Optional[Variant[Array[String],String]] $redirectmatch_dest = undef ,
1856
1856
Array[String[1]] $headers = [],
1857
1857
Array[String[1]] $request_headers = [],
1858
- Optional[ Array[String]] $filters = undef ,
1858
+ Array[String[1 ]] $filters = [] ,
1859
1859
Optional[Array] $rewrites = undef ,
1860
1860
Optional[String] $rewrite_base = undef ,
1861
1861
Optional[Variant[Array[String],String]] $rewrite_rule = undef ,
2259
2259
}
2260
2260
}
2261
2261
2262
- # Check if mod_filter is required to process $filters
2263
- if $filters {
2264
- if ! defined (Class[' apache::mod::filter' ]) {
2265
- include apache::mod::filter
2266
- }
2267
- }
2268
-
2269
2262
# Check if mod_env is required and not yet loaded.
2270
2263
# create an expression to simplify the conditional check
2271
2264
$use_env_mod = $setenv and ! empty($setenv )
2906
2899
2907
2900
# Template uses:
2908
2901
# - $filters
2909
- if $filters and ! empty($filters ) {
2902
+ if ! empty($filters ) and $ensure == ' present' {
2903
+ include apache::mod::filter
2904
+
2910
2905
concat::fragment { "${name}-filters" :
2911
2906
target => " ${priority_real}${filename} .conf" ,
2912
2907
order => 330,
Original file line number Diff line number Diff line change 1
- <% if @filters and ! @filters.empty? -%>
1
+ <% unless @filters.empty? -%>
2
2
3
3
## Filter module rules
4
4
## as per http://httpd.apache.org/docs/2.2/mod/mod_filter.html
5
- <%- Array(@filters).each do |filter| -%>
6
- <%- if filter != '' -%>
5
+ <%- @filters.each do |filter| -%>
7
6
<%= filter %>
8
- <%- end -%>
9
7
<%- end -%>
10
8
<% end -%>
You can’t perform that action at this time.
0 commit comments