diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp index 816c845..eaac8c1 100644 --- a/manifests/resource/vhost.pp +++ b/manifests/resource/vhost.pp @@ -379,7 +379,7 @@ define nginx::resource::vhost ( $access_log_real = $format_log ? { undef => $access_log_tmp, - default => "${access_log_tmp} $format_log", + default => "${access_log_tmp} ${format_log}", } $error_log_real = $error_log ? { @@ -480,11 +480,21 @@ define nginx::resource::vhost ( # Create SSL File Stubs if SSL is enabled if ($ssl == true) { # Access and error logs are named differently in ssl template - $ssl_access_log = $access_log ? { + + # This was a lot to add up in parameter list so add it down here + # Also opted to add more logic here and keep template cleaner which + # unfortunately means resorting to the $varname_real thing + $ssl_access_log_tmp = $access_log ? { undef => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.access.log", default => $access_log, } - $ssl_error_log = $error_log ? { + + $ssl_access_log_real = $format_log ? { + undef => $ssl_access_log_tmp, + default => "${ssl_access_log_tmp} ${format_log}", + } + + $ssl_error_log_real = $error_log ? { undef => "${nginx::params::nx_logdir}/ssl-${name_sanitized}.error.log", default => $error_log, } diff --git a/templates/vhost/vhost_ssl_header.erb b/templates/vhost/vhost_ssl_header.erb index 984f03f..4adec10 100644 --- a/templates/vhost/vhost_ssl_header.erb +++ b/templates/vhost/vhost_ssl_header.erb @@ -48,8 +48,8 @@ server { index <% Array(@index_files).each do |i| %> <%= i %><% end %>; <% end -%> - access_log <%= @ssl_access_log %>; - error_log <%= @ssl_error_log %>; + access_log <%= @ssl_access_log_real %>; + error_log <%= @ssl_error_log_real %>; <% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%> <% if value.is_a?(Hash) -%><% value.each do |subkey,subvalue| -%>