Skip to content

Commit 6b2a20a

Browse files
author
Ciaran McCrisken
committed
(MAINT) Adjust $use_servername_for_filenames behaviour change timeline
Given the relatively close time of the `v6.0.0` release after the `$use_servername_for_filenames` introduction, and the fact that it is slated to change it's default value and behaviour from the next major release, we are adjusting the timeline to give more people time to adjust.
1 parent 61b157a commit 6b2a20a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

manifests/vhost.pp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,10 +2078,10 @@
20782078
# We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be
20792079
# used, using the new $use_servername_for_filenames and $use_port_for_filenames parameters.
20802080
#
2081-
# This will default to false until the next major release (v6.0.0), at which point, we will default this to true and
2082-
# warn about it's imminent deprecation in the subsequent major release (v7.0.0)
2081+
# This will default to false until the next major release (v7.0.0), at which point, we will default this to true and
2082+
# warn about it's imminent deprecation in the subsequent major release (v8.0.0)
20832083
#
2084-
# In v7.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
2084+
# In v8.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether
20852085
# and use the sanitized value of $servername for default log / config filenames.
20862086
$filename = $use_servername_for_filenames ? {
20872087
true => $use_port_for_filenames ? {
@@ -2098,7 +2098,7 @@
20982098
When $use_servername_for_filenames = true, the $servername parameter, sanitized, is used to construct log and config
20992099
file names.
21002100
2101-
From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the
2101+
From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
21022102
module, the $use_servername_for_filenames will be removed and log/config file names will be dervied from the
21032103
sanitized $servername parameter when not explicitly defined.'
21042104
warning($use_servername_for_filenames_warn_msg)
@@ -2109,7 +2109,7 @@
21092109
When $use_port_for_filenames = true, the $servername and $port parameters, sanitized, are used to construct log and
21102110
config file names.
21112111
2112-
From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the
2112+
From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the
21132113
module, the $use_port_for_filenames will be removed and log/config file names will be dervied from the
21142114
sanitized $servername parameter when not explicitly defined.'
21152115
warning($use_port_for_filenames_warn_msg)

0 commit comments

Comments
 (0)