Merge remote-tracking branch 'rsynnest/patch-2' into IAC-1186/main/sanitize-log-filename

Author: Ciaran McCrisken

REFERENCE.md

@@ -6582,9 +6582,9 @@ Default value: ``false``
 Data type: `Any`
 
 Sets the filename of the `*_access.log` placed in `logroot`. Given a virtual host ---for
-instance, example.com--- it defaults to 'example.com_ssl.log' for
+instance, `my example.com` --- it defaults to 'my_example.com_ssl.log' for
 [SSL-encrypted](https://httpd.apache.org/docs/current/ssl/index.html) virtual hosts and
-`example.com_access.log` for unencrypted virtual hosts.
+`my_example.com_access.log` for unencrypted virtual hosts.
 
 Default value: ``false``
 
@@ -6893,9 +6893,9 @@ Data type: `Any`
 
 Points the virtual host's error logs to a `*_error.log` file. If this parameter is
 undefined, Puppet checks for values in `error_log_pipe`, then `error_log_syslog`.<br />
-If none of these parameters is set, given a virtual host `example.com`, Puppet defaults
-to `$logroot/example.com_error_ssl.log` for SSL virtual hosts and
-`$logroot/example.com_error.log` for non-SSL virtual hosts.
+If none of these parameters is set, given a virtual host `my example.com`, Puppet defaults
+to `$logroot/my_example.com_error_ssl.log` for SSL virtual hosts and
+`$logroot/my_example.com_error.log` for non-SSL virtual hosts.
 
 Default value: ``undef``
 
@@ -6916,8 +6916,8 @@ Data type: `Any`
 Determines whether to send all error log messages to syslog.
 This parameter has no effect if either of the `error_log_file` or `error_log_pipe`
 parameters has a value. If none of these parameters has a value, given a virtual host
-`example.com`, Puppet defaults to `$logroot/example.com_error_ssl.log` for SSL virtual
-hosts and `$logroot/example.com_error.log` for non-SSL virtual hosts.
+`my example.com`, Puppet defaults to `$logroot/my_example.com_error_ssl.log` for SSL virtual
+hosts and `$logroot/my_example.com_error.log` for non-SSL virtual hosts. 
 
 Default value: ``undef``
 
@@ -7567,9 +7567,9 @@ Default value: ``undef``
 
 Data type: `Any`
 
-If `modsec_audit_log` is `true`, given a virtual host ---for instance, example.com--- it
-defaults to `example.com\_security\_ssl.log` for SSL-encrypted virtual hosts
-and `example.com\_security.log` for unencrypted virtual hosts.<br />
+If `modsec_audit_log` is `true`, given a virtual host ---for instance, `my example.com` --- it
+defaults to `my_example.com\_security\_ssl.log` for SSL-encrypted virtual hosts
+and `my_example.com\_security.log` for unencrypted virtual hosts. <br />
 One of the parameters that determines how to send `mod_security` audit
 log ([SecAuditLog](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual#SecAuditLog)).<br />
 If none of those parameters are set, the global audit log is used

manifests/vhost.pp

@@ -2096,9 +2096,9 @@
     $error_log_destination = $error_log_syslog
   } else {
     if $ssl {
-      $error_log_destination = "${logroot}/${name}_error_ssl.log"
+      $error_log_destination = "${logroot}/${filename}_error_ssl.log"
     } else {
-      $error_log_destination = "${logroot}/${name}_error.log"
+      $error_log_destination = "${logroot}/${filename}_error.log"
     }
   }
 
@@ -2117,9 +2117,9 @@
     $modsec_audit_log_destination = $modsec_audit_log_pipe
   } elsif $modsec_audit_log {
     if $ssl {
-      $modsec_audit_log_destination = "${logroot}/${name}_security_ssl.log"
+      $modsec_audit_log_destination = "${logroot}/${filename}_security_ssl.log"
     } else {
-      $modsec_audit_log_destination = "${logroot}/${name}_security.log"
+      $modsec_audit_log_destination = "${logroot}/${filename}_security.log"
     }
   } else {
     $modsec_audit_log_destination = undef

templates/vhost/_access_log.erb

@@ -14,8 +14,8 @@
 <%   elsif log['pipe'] -%>
 <%     destination = log['pipe'] -%>
 <%   else -%>
-<%     destination ||= "#{@logroot}/#{@name}_access_ssl.log" if @ssl -%>
-<%     destination ||= "#{@logroot}/#{@name}_access.log" -%>
+<%     destination ||= "#{@logroot}/#{@filename}_access_ssl.log" if @ssl -%>
+<%     destination ||= "#{@logroot}/#{@filename}_access.log" -%>
 <%   end -%>
   CustomLog "<%= destination %>" <%= format %> <%= env %>
 <% end -%>