Adapt radosgw configuration for SUSE:

fix package lists, specify path for s3gw.fcgi

diff --git a/attributes/radosgw.rb b/attributes/radosgw.rb
index 833f3c62d38cdf7173387fbd1accd98e04abc045..11e39c2884c81e85bd7db5f928e12bec74b48fc3 100644 (file)
--- a/attributes/radosgw.rb
+++ b/attributes/radosgw.rb
@@ -27,6 +27,12 @@ default['ceph']['radosgw']['webserver_companion'] = 'apache2' # can be false
 default['ceph']['radosgw']['use_apache_fork'] = true
 default['ceph']['radosgw']['init_style'] = node['ceph']['init_style']
 
+default['ceph']['radosgw']['path'] = '/var/www'
+
+if node['platform_family'] == 'suse'
+  default['ceph']['radosgw']['path'] = '/srv/www/ceph-radosgw'
+end
+
 case node['platform_family']
 when 'debian'
   packages = ['radosgw']

diff --git a/attributes/radosgw_apache2.rb b/attributes/radosgw_apache2.rb
index 047c2a832fa70d282a31ae756d8668d7998086de..79d6d45b13a5ce9a4e8b97f60429f389ab4ccff9 100644 (file)
--- a/attributes/radosgw_apache2.rb
+++ b/attributes/radosgw_apache2.rb
@@ -1,6 +1,8 @@
 case node['platform_family']
-when 'debian', 'suse'
+when 'debian'
   default['ceph']['radosgw']['apache2']['packages'] = ['libapache2-mod-fastcgi']
+when 'suse'
+  default['ceph']['radosgw']['apache2']['packages'] = ['apache2-mod_fastcgi', 'apache2-worker']
 when 'rhel', 'fedora'
   default['ceph']['radosgw']['apache2']['packages'] = ['mod_fastcgi']
 end

diff --git a/recipes/radosgw_apache2.rb b/recipes/radosgw_apache2.rb
index 7f8b86b006fcf94841cf99efb8b44a725ac9cefd..8b266c0beffa2c5cc0a68ee9d7b59a181e4134bf 100644 (file)
--- a/recipes/radosgw_apache2.rb
+++ b/recipes/radosgw_apache2.rb
@@ -68,7 +68,14 @@ web_app 'rgw' do
   ceph_rgw_addr node['ceph']['radosgw']['rgw_addr']
 end
 
-template '/var/www/s3gw.fcgi' do
+directory node['ceph']['radosgw']['path'] do
+  owner 'root'
+  group 'root'
+  mode '0755'
+  action :create
+end
+
+template "#{node['ceph']['radosgw']['path']}/s3gw.fcgi" do
   source 's3gw.fcgi.erb'
   owner 'root'
   group 'root'
@@ -77,3 +84,11 @@ template '/var/www/s3gw.fcgi' do
     :ceph_rgw_client => "client.radosgw.#{node['hostname']}"
   )
 end
+
+if node['platform_family'] == 'suse'
+  bash 'Set MPM apache value' do
+    code 'sed -i s/^[[:space:]]*APACHE_MPM=.*/APACHE_MPM=\"worker\"/ /etc/sysconfig/apache2'
+    not_if 'grep -q "^[[:space:]]*APACHE_MPM=\"worker\"" /etc/sysconfig/apache2'
+    notifies :restart, 'service[apache2]'
+  end
+end

diff --git a/templates/default/rgw.conf.erb b/templates/default/rgw.conf.erb
index 322fb0124957447330ffdd3b8558411f769c3f9e..1f358806ffc0e26edcaec6aeb5c66a8691be5457 100644 (file)
--- a/templates/default/rgw.conf.erb
+++ b/templates/default/rgw.conf.erb
@@ -1,7 +1,7 @@
 <% if node['ceph']['radosgw']['rgw_port'] -%>
-FastCgiExternalServer /var/www/s3gw.fcgi -host 127.0.0.1:<%= node['ceph']['radosgw']['rgw_port'] %>
+FastCgiExternalServer <%= node['ceph']['radosgw']['path'] %>/s3gw.fcgi -host 127.0.0.1:<%= node['ceph']['radosgw']['rgw_port'] %>
 <% else -%>
-FastCgiExternalServer /var/www/s3gw.fcgi -socket /var/run/ceph/radosgw.<%= node['hostname'] %>
+FastCgiExternalServer <%= node['ceph']['radosgw']['path'] %>/s3gw.fcgi -socket /var/run/ceph/radosgw.<%= node['hostname'] %>
 <% end -%>
 
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" \"%{Host}i\"" proxy_combined
@@ -15,13 +15,13 @@ LogFormat "%{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{Use
 <%   end -%>
 <% end -%>
   ServerAdmin <%= node["ceph"]["radosgw"]["admin_email"] %>
-  DocumentRoot /var/www/
+  DocumentRoot <%= node['ceph']['radosgw']['path'] %>
 
   RewriteEngine On
   RewriteRule ^/([a-zA-Z0-9-_.]*)([/]?.*) /s3gw.fcgi?page=$1&params=$2&%{QUERY_STRING} [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
 
   <IfModule mod_fastcgi.c>
-    <Directory /var/www/>
+    <Directory <%= node['ceph']['radosgw']['path'] %>>
       Options +ExecCGI
       AllowOverride All
       SetHandler fastcgi-script