fix: fix apache cache_ignore_header regression

puppetlabs · Jan 31, 2024 · 985bb0f · 985bb0f
1 parent 4d44b84
commit 985bb0f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
@@ -1,5 +1,5 @@
 <% |
-  Optional[String] $cache_ignore_headers              = undef,
+  Optional[Array[String[1]]] $cache_ignore_headers    = undef,
   Optional[Integer] $cache_default_expire             = undef,
   Optional[Integer] $cache_max_expire                 = undef,
   Optional[Apache::OnOff] $cache_ignore_no_lastmod    = undef,
@@ -26,5 +26,5 @@ CacheLock <%= $cache_lock %>
 CacheIgnoreCacheControl <%= $cache_ignore_cache_control %>
 <%- } -%>
 <%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers -%>
+CacheIgnoreHeaders <% $cache_ignore_headers.each |$header| { %><%= $header %> <% } %>
 <%- } -%>
diff --git a/templates/mod/cache_disk.conf.epp b/templates/mod/cache_disk.conf.epp
@@ -4,7 +4,6 @@
   Optional[Integer] $cache_dir_length   = undef,
   Optional[Integer] $cache_dir_levels   = undef,
   Optional[Integer] $cache_max_filesize = undef,
-  Optional[String] $cache_ignore_headers = undef,
 | -%>
 <%- if $cache_enable { -%>
   <%- $cache_enable.each |$enable| { -%>
@@ -21,6 +20,3 @@ CacheDirLength <%= $cache_dir_length %>
 <%- if $cache_max_filesize { -%>
 CacheMaxFileSize <%= $cache_max_filesize %>
 <%- } -%>
-<%- if $cache_ignore_headers { -%>
-CacheIgnoreHeaders <%= $cache_ignore_headers -%>
-<%- } -%>