Skip to content

Commit 4597519

Browse files
committed
Simplify apache::vhost::serveraliases logic
The data type does not allow a value that evaluates to false so no need ot check for it.
1 parent 908ee11 commit 4597519

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

manifests/vhost.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2551,7 +2551,7 @@
25512551

25522552
# Template uses:
25532553
# - $serveraliases
2554-
if $serveraliases and ! empty($serveraliases) {
2554+
if ! empty($serveraliases) and $ensure == 'present' {
25552555
concat::fragment { "${name}-serveralias":
25562556
target => "${priority_real}${filename}.conf",
25572557
order => 210,

templates/vhost/_serveralias.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<% if @serveraliases and ! @serveraliases.empty? -%>
1+
<% unless @serveraliases.empty? -%>
22

33
## Server aliases
44
<%- Array(@serveraliases).each do |serveralias| -%>

0 commit comments

Comments
 (0)