Skip to content

Commit fe236e2

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 2cafceb commit fe236e2

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,
@@ -2467,13 +2467,12 @@
24672467
}
24682468

24692469
# Template uses:
2470-
# - $access_log
2470+
# - $_access_logs
24712471
# - $_access_log_env_var
24722472
# - $access_log_destination
24732473
# - $_access_log_format
24742474
# - $_access_log_env_var
2475-
# - $access_logs
2476-
if $access_log or $access_logs {
2475+
if !empty($_access_logs) {
24772476
concat::fragment { "${name}-access_log":
24782477
target => "${priority_real}${filename}.conf",
24792478
order => 100,

0 commit comments

Comments
 (0)