fix: handle undefined value of $cache_ignore_headers in deprecated mo…

…dule and remove module from bsd defaults
puppetlabs · Feb 1, 2024 · 681463f · 681463f
1 parent f23e382
commit 681463f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
@@ -69,8 +69,6 @@
       'FreeBSD': {
         include apache::mod::actions
         include apache::mod::authn_core
-        include apache::mod::cache
-        include apache::mod::disk_cache
         include apache::mod::filter
         include apache::mod::headers
         include apache::mod::info

diff --git a/manifests/mod/disk_cache.pp b/manifests/mod/disk_cache.pp
@@ -1,6 +1,6 @@
 # @summary
 #   Installs and configures `mod_disk_cache`.
-# 
+#
 # @param cache_root
 #   Defines the name of the directory on the disk to contain cache files.
 #   Default depends on the Apache version and operating system:
@@ -28,10 +28,15 @@
 ) {
   deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
 
+  $_cache_ignore_headers = $cache_ignore_headers ? {
+    undef   => [],
+    default => $cache_ignore_headers.split(' ')
+  }
+
   class { 'apache::mod::cache_disk':
     cache_root              => $cache_root,
     cache_enable            => ['/'],
-    cache_ignore_headers    => $cache_ignore_headers.split(' '),
+    cache_ignore_headers    => $_cache_ignore_headers,
     cache_dir_length        => 1,
     cache_dir_levels        => 2,
     configuration_file_name => 'cache_disk.conf'