From 985bb0f4af12a930b8d81c57bab49966c0bfef76 Mon Sep 17 00:00:00 2001
From: Thomas Minor <Thomas.Minor@kps.com>
Date: Wed, 31 Jan 2024 15:52:29 +0100
Subject: [PATCH] fix: fix apache cache_ignore_header regression

---
 templates/mod/cache.conf.epp      | 4 ++--
 templates/mod/cache_disk.conf.epp | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/templates/mod/cache.conf.epp b/templates/mod/cache.conf.epp
index 136f277e4..54fa76441 100644
--- 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
index 030f0ba93..55d3351d1 100644
--- 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 -%>
-<%- } -%>