From 6c0389d0c2f978bf1630c34bde3597311fe0d276 Mon Sep 17 00:00:00 2001 From: Mike Tiurin Date: Thu, 6 Apr 2023 09:58:22 +0300 Subject: [PATCH] Add access and error logs directives when www_to_non_www or non_www_to_www is used. --- templates/server/server_header.erb | 22 ++++++++++++++++++++++ templates/server/server_ssl_header.erb | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/templates/server/server_header.erb b/templates/server/server_header.erb index 185432f98..2b6b74ddd 100644 --- a/templates/server/server_header.erb +++ b/templates/server/server_header.erb @@ -34,6 +34,28 @@ server { return 301 http://www.<%= s %>$request_uri; <%- end -%> <%- end -%> +<% if @access_log.is_a?(Array) -%> + <%- @access_log.each do |log_item| -%> + access_log <%= log_item %><% if @format_log %> <%= @format_log%><% end %>; + <%- end -%> +<% elsif @access_log == 'absent' -%> +<% elsif @access_log == 'off' -%> + access_log off; +<% elsif not @access_log -%> + access_log <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>; +<% else -%> + access_log <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>; +<% end -%> +<% if @error_log.is_a?(Array) -%> + <%- @error_log.each do |log_item| -%> + error_log <%= log_item %>; + <%- end -%> +<% elsif @error_log == 'absent' -%> +<% elsif not @error_log -%> + error_log <%= scope['::nginx::config::log_dir'] %>/<%= @name_sanitized %>.error.log; +<% else -%> + error_log <%= @error_log %>; +<% end -%> } <% end -%> diff --git a/templates/server/server_ssl_header.erb b/templates/server/server_ssl_header.erb index 973ad9603..1185599fb 100644 --- a/templates/server/server_ssl_header.erb +++ b/templates/server/server_ssl_header.erb @@ -19,6 +19,28 @@ server { <%- end -%> <%= scope.function_template(["nginx/server/server_ssl_settings.erb"]) %> +<% if @access_log.is_a?(Array) -%> + <%- @access_log.each do |log_item| -%> + access_log <%= log_item %><% if @format_log %> <%= @format_log%><% end %>; + <%- end -%> +<% elsif @access_log == 'absent' -%> +<% elsif @access_log == 'off' -%> + access_log off; +<% elsif not @access_log -%> + access_log <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.access.log<% if @format_log %> <%= @format_log%><% end %>; +<% else -%> + access_log <%= @access_log %><% if @format_log %> <%= @format_log%><% end %>; +<% end -%> +<% if @error_log.is_a?(Array) -%> + <%- @error_log.each do |log_item| -%> + error_log <%= log_item %>; + <%- end -%> +<% elsif @error_log == 'absent' -%> +<% elsif not @error_log -%> + error_log <%= scope['::nginx::config::log_dir'] %>/ssl-<%= @name_sanitized %>.error.log; +<% else -%> + error_log <%= @error_log %>; +<% end -%> }