Merge branch 'master' of github.com:lusis/chef-kibana

Conflicts:
	README.md

README.md

@@ -57,7 +57,7 @@ If you would like to modify the `nginx` or `apache` parameters, you should:
 
 #### kibana::examples
 
-The examples cookbook lists further examples using the LWRPs to install and configure kibana and is definately _not_ intended to be run.
+examples of using the LWRPs.  Don't use this directly.
 
 Testing
 -------

templates/default/kibana-nginx.conf.erb

@@ -2,7 +2,7 @@ server {
   listen                <%= @listen_address %>:<%= @listen_port %>;
 
   server_name           <%= @server_name %> <%= @server_aliases.join(" ") %>;
-  access_log            /var/log/nginx/<%= @server_name %>.access.log;
+  access_log            <%= node['nginx']['log_dir'] %>/<%= @server_name %>.access.log;
 
   location / {
     root  <%= @kibana_dir %>;