Skip to content

Commit be290e7

Browse files
committed
Don't know what i was working on ;)
1 parent 1b7f66d commit be290e7

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

manifests/vhost.pp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# - The $docroot provides the Documentation Root variable
88
# - The $template option specifies whether to use the default template or override
99
# - The $priority of the site
10-
# - The $serveraliases of the site
10+
# - The $server_aliases of the site
1111
#
1212
# Actions:
1313
# - Install Nginx Virtual Hosts
@@ -27,7 +27,8 @@
2727
$port = '80',
2828
$template = 'nginx/vhost/vhost.conf.erb',
2929
$priority = '50',
30-
$serveraliases = '',
30+
$serveraliases = undef,
31+
$server aliases = '',
3132
$create_docroot = true,
3233
$enable = true,
3334
$owner = '',
@@ -49,6 +50,20 @@
4950

5051
$bool_create_docroot = any2bool($create_docroot)
5152

53+
# $serveraliases is deprecated
54+
if ($serveraliases != undef) {
55+
warning('nginx: nginx::vhost serveraliases is deprecated. Please use server_aliases instead.')
56+
}
57+
58+
# convert server_aliases to an array
59+
$array_server_aliases = is_array($server_aliases) ? {
60+
false => $server_aliases ? {
61+
'' => [],
62+
default => [$server_aliases],
63+
},
64+
default => $server_aliases,
65+
}
66+
5267
file { "${nginx::vdir}/${priority}-${name}.conf":
5368
content => template($template),
5469
mode => $nginx::config_file_mode,

0 commit comments

Comments
 (0)