From 6b2a20a390df597f04222571dc7fac366a8ea898 Mon Sep 17 00:00:00 2001 From: Ciaran McCrisken Date: Thu, 25 Feb 2021 15:36:51 +0000 Subject: [PATCH] (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. --- manifests/vhost.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/vhost.pp b/manifests/vhost.pp index 3326b6fbb7..ff0e2b30a8 100644 --- a/manifests/vhost.pp +++ b/manifests/vhost.pp @@ -2078,10 +2078,10 @@ # We will retain the default behaviour for filenames but allow the use of a sanitized version of $servername to be # used, using the new $use_servername_for_filenames and $use_port_for_filenames parameters. # - # This will default to false until the next major release (v6.0.0), at which point, we will default this to true and - # warn about it's imminent deprecation in the subsequent major release (v7.0.0) + # This will default to false until the next major release (v7.0.0), at which point, we will default this to true and + # warn about it's imminent deprecation in the subsequent major release (v8.0.0) # - # In v7.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether + # In v8.0.0, we will deprecate the $use_servername_for_filenames and $use_port_for_filenames parameters altogether # and use the sanitized value of $servername for default log / config filenames. $filename = $use_servername_for_filenames ? { true => $use_port_for_filenames ? { @@ -2098,7 +2098,7 @@ When $use_servername_for_filenames = true, the $servername parameter, sanitized, is used to construct log and config file names. - From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the + From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the module, the $use_servername_for_filenames will be removed and log/config file names will be dervied from the sanitized $servername parameter when not explicitly defined.' warning($use_servername_for_filenames_warn_msg) @@ -2109,7 +2109,7 @@ When $use_port_for_filenames = true, the $servername and $port parameters, sanitized, are used to construct log and config file names. - From version v6.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v7.0.0 of the + From version v7.0.0 of the puppetlabs-apache module, this parameter will default to true. From version v8.0.0 of the module, the $use_port_for_filenames will be removed and log/config file names will be dervied from the sanitized $servername parameter when not explicitly defined.' warning($use_port_for_filenames_warn_msg)