Moves radosgw logs to /var/log/ceph

It looks like the package logrotate scripts expect them to be there

diff --git a/recipes/radosgw_apache2.rb b/recipes/radosgw_apache2.rb
index b2694d9be361145b1bebe675ab5bd50992b85b52..5402a1d264e5741042fbdb456210d0f31a471e09 100644 (file)
--- a/recipes/radosgw_apache2.rb
+++ b/recipes/radosgw_apache2.rb
@@ -60,13 +60,6 @@ end
   end
 end
 
-file '/var/log/radosgw/radosgw.log' do
-  owner d_owner
-  group d_group
-  mode '0644'
-  action :create
-end
-
 include_recipe 'apache2'
 
 apache_module 'fastcgi' do

diff --git a/templates/default/ceph.conf.erb b/templates/default/ceph.conf.erb
index 40539a539ba763715e0a8f133a08516b8bead82a..e82d191792d78e767638433e278fff2526af63b2 100644 (file)
--- a/templates/default/ceph.conf.erb
+++ b/templates/default/ceph.conf.erb
@@ -34,7 +34,7 @@
   host = <%= node['hostname'] %>
   rgw socket path = /var/run/ceph/radosgw.<%= node['hostname'] %>
   keyring = /etc/ceph/ceph.client.radosgw.<%= node['hostname'] %>.keyring
-  log file = /var/log/radosgw/radosgw.log
+  log file = /var/log/ceph/radosgw.log
 <% if (! node['ceph']['config']['rgw'].nil?) -%>
   <% node['ceph']['config']['rgw'].sort.each do |k, v| %>
   <%= k %> = <%= v %>