[COOK-3428] Disable logging when disable_access_log is true

README.md

@@ -101,6 +101,10 @@ config file.
   value of `server_names_hash_bucket_size`.
 * `node['nginx']['disable_access_log']` - set to true to disable the
   general access log, may be useful on high traffic sites.
+* `node['nginx']['access_log_options']` - Set to a string of additional options
+  to be appended to the access log directive
+* `node['nginx']['error_log_options']` - Set to a string of additional options
+  to be appended to the error log directive
 * `node['nginx']['default_site_enabled']` - enable the default site
 * `node['nginx']['sendfile']` - Whether to use `sendfile`. Defaults to "on".
 * `node['nginx']['install_method']` - Whether nginx is installed from

attributes/default.rb

@@ -87,6 +87,8 @@
 default['nginx']['server_names_hash_bucket_size'] = 64
 default['nginx']['sendfile'] = 'on'
 
+default['nginx']['access_log_options'] = nil
+default['nginx']['error_log_options'] = nil
 default['nginx']['disable_access_log'] = false
 default['nginx']['install_method'] = 'package'
 default['nginx']['default_site_enabled'] = true

templates/default/nginx.conf.erb

@@ -7,7 +7,7 @@ daemon off;
 worker_rlimit_nofile <%= node['nginx']['worker_rlimit_nofile'] %>;
 <% end -%>
 
-error_log  <%= node['nginx']['log_dir'] %>/error.log;
+error_log  <%= node['nginx']['log_dir'] %>/error.log<% if node['nginx']['error_log_options'] %> <%= node['nginx']['error_log_options'] %><% end %>;
 pid        <%= node['nginx']['pid'] %>;
 
 events {
@@ -28,8 +28,10 @@ http {
   include       <%= node['nginx']['dir'] %>/mime.types;
   default_type  application/octet-stream;
 
-  <% unless node['nginx']['disable_access_log'] -%>
-  access_log	<%= node['nginx']['log_dir'] %>/access.log;
+  <% if node['nginx']['disable_access_log'] -%>
+  access_log    off;
+  <% else -%>
+  access_log	<%= node['nginx']['log_dir'] %>/access.log<% if node['nginx']['access_log_options'] %> <%= node['nginx']['access_log_options'] %><% end %>;
   <% end %>
   <% if node['nginx']['server_tokens'] -%>
   server_tokens <%= node['nginx']['server_tokens'] %>;