Skip to content

Commit 873dc6b

Browse files
committed
fix: handle undefined value of $cache_ignore_headers in deprecated module and remove module from bsd defaults
1 parent 6c29fbf commit 873dc6b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

manifests/default_mods.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@
6969
'FreeBSD': {
7070
include apache::mod::actions
7171
include apache::mod::authn_core
72-
include apache::mod::cache
73-
include apache::mod::disk_cache
7472
include apache::mod::filter
7573
include apache::mod::headers
7674
include apache::mod::info

manifests/mod/disk_cache.pp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# @summary
22
# Installs and configures `mod_disk_cache`.
3-
#
3+
#
44
# @param cache_root
55
# Defines the name of the directory on the disk to contain cache files.
66
# Default depends on the Apache version and operating system:
@@ -28,10 +28,15 @@
2828
) {
2929
deprecation('apache::mod::disk_cache', 'This class is deprecated; please use apache::mod::cache_disk')
3030

31+
$_cache_ignore_headers = $cache_ignore_headers ? {
32+
undef => [],
33+
default => $cache_ignore_headers.split(' ')
34+
}
35+
3136
class { 'apache::mod::cache_disk':
3237
cache_root => $cache_root,
3338
cache_enable => ['/'],
34-
cache_ignore_headers => $cache_ignore_headers.split(' '),
39+
cache_ignore_headers => $_cache_ignore_headers,
3540
cache_dir_length => 1,
3641
cache_dir_levels => 2,
3742
configuration_file_name => 'cache_disk.conf'

0 commit comments

Comments
 (0)