Support apache and mod_fastcgi forks for RGW

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>

diff --git a/attributes/radosgw.rb b/attributes/radosgw.rb
index bc7b68c785fe0a13b15f88f67bfea3ab696cb86b..b85bfa24f5616778f90e44b3969c8232d115024c 100644 (file)
--- a/attributes/radosgw.rb
+++ b/attributes/radosgw.rb
@@ -21,3 +21,4 @@ default["ceph"]["radosgw"]["admin_email"] = "admin@example.com"
 default["ceph"]["radosgw"]["rgw_addr"] = "*:80"
 default["ceph"]["radosgw"]["rgw_port"] = false
 default["ceph"]["radosgw"]["webserver_companion"] = "apache2" #can be false
+default['ceph']["radosgw"]['use_apache_fork'] = true

diff --git a/recipes/apt.rb b/recipes/apt.rb
index 0b3dabe95c361e3ee599c5806ed2827b343d258e..a66af311a59a8c49616cbdb2dc52003979d3847b 100644 (file)
--- a/recipes/apt.rb
+++ b/recipes/apt.rb
@@ -27,3 +27,26 @@ when "dev"
   end
 end
 
+if node['roles'].include?("ceph-radosgw") \
+ && node["ceph"]["radosgw"]["webserver_companion"] == "apache2" \
+ && node["ceph"]["radosgw"]["use_apache_fork"] == true
+  case node['lsb']['codename']
+  when "precise","oneiric"
+    apt_repository "ceph-apache2" do
+      repo_name "ceph-apache2"
+      uri "http://gitbuilder.ceph.com/apache2-deb-#{node['lsb']['codename']}-x86_64-basic/ref/master"
+      distribution node['lsb']['codename']
+      components ["main"]
+      key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+    end
+    apt_repository "ceph-modfastcgi" do
+      repo_name "ceph-modfastcgi"
+      uri "http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-#{node['lsb']['codename']}-x86_64-basic/ref/master"
+      distribution node['lsb']['codename']
+      components ["main"]
+      key "https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc"
+    end
+  else
+    Log.info("Ceph's Apache and Apache FastCGI forks not available for this distribution")
+  end
+end