Merge pull request #1638 from toggetit/master

Fix logging statements in locations

Author: kenyon

spec/defines/resource_location_spec.rb

@@ -295,15 +295,15 @@
               title: 'should set error_log',
               attr: 'error_log',
               value: '/path/to/error.log',
-              match: '  error_log             /path/to/error.log;'
+              match: '    error_log             /path/to/error.log;'
             },
             {
               title: 'should allow multiple error_log directives',
               attr: 'error_log',
               value: ['/path/to/error.log', 'syslog:server=localhost'],
               match: [
-                '  error_log             /path/to/error.log;',
-                '  error_log             syslog:server=localhost;'
+                '    error_log             /path/to/error.log;',
+                '    error_log             syslog:server=localhost;'
               ]
             },
             {

templates/server/location_header.erb

@@ -91,22 +91,20 @@
 <% if @access_log -%>
     <% if @access_log.is_a?(Array) -%>
         <%- @access_log.each do |log_item| -%>
-  access_log            <%= log_item %><% unless @format_log.nil? -%> <%= @format_log %><% end -%>;
+    access_log            <%= log_item %><% unless @format_log.nil? -%> <%= @format_log %><% end -%>;
         <%- end -%>
     <% elsif @access_log == 'absent' -%>
     <% elsif @access_log == 'off' -%>
-  access_log            off;
+    access_log            off;
     <% else -%>
     access_log <%= @access_log %><% unless @format_log.nil? -%> <%= @format_log %><% end -%>;
     <% end -%>
 <% end -%>
 <% if @error_log.is_a?(Array) -%>
   <%- @error_log.each do |log_item| -%>
-  error_log             <%= 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;
+<% elsif @error_log == 'absent' || @error_log.nil? -%>
 <% else -%>
-  error_log             <%= @error_log %>;
+    error_log             <%= @error_log %>;
 <% end -%>