Skip to content

Commit 32c3cac

Browse files
committed
Stricter data type on apache::vhost::access_logs
This always required an array of hashes. This closer matches the actual behavior. It also fixes the check on the template use by checking the correct variable. bb96180 broke this. Fixes: bb96180
1 parent 7b22dae commit 32c3cac

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

manifests/vhost.pp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,7 +1800,7 @@
18001800
Variant[Boolean,String] $access_log_syslog = false,
18011801
Variant[Boolean,String] $access_log_format = false,
18021802
Variant[Boolean,String] $access_log_env_var = false,
1803-
Optional[Array] $access_logs = undef,
1803+
Optional[Array[Hash]] $access_logs = undef,
18041804
Boolean $use_servername_for_filenames = false,
18051805
Boolean $use_port_for_filenames = false,
18061806
Optional[Variant[Array[Hash],Hash,String]] $aliases = undef,
@@ -2459,13 +2459,12 @@
24592459
}
24602460

24612461
# Template uses:
2462-
# - $access_log
2462+
# - $_access_logs
24632463
# - $_access_log_env_var
24642464
# - $access_log_destination
24652465
# - $_access_log_format
24662466
# - $_access_log_env_var
2467-
# - $access_logs
2468-
if $access_log or $access_logs {
2467+
if !empty($_access_logs) {
24692468
concat::fragment { "${name}-access_log":
24702469
target => "${priority_real}${filename}.conf",
24712470
order => 100,

0 commit comments

Comments
 (0)