Install gems for the rails code in deployment mode

[chef.git] / cookbooks / web / resources / rails_port.rb

diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index 3f5078d3487354899d71d1448ea8bbda89f4b750..6816904521e6f8a5ddcf1b81afe9d1f72d24de02 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -364,7 +364,9 @@ action :create do
     "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],
     "max_number_of_relation_members" => node[:web][:max_number_of_relation_members],
     "oauth_10_support" => false,
     "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],
     "max_number_of_relation_members" => node[:web][:max_number_of_relation_members],
     "oauth_10_support" => false,

-    "oauth_10_registration" => false
+    "oauth_10_registration" => false,
+    "oauth_10a_support" => false,
+    "basic_auth_support" => false

   )
 
   if new_resource.memcache_servers
   )
 
   if new_resource.memcache_servers


@@ -406,11 +408,25 @@ action :create do
     action :delete
   end
 
     action :delete
   end
 

+  directory "#{rails_directory}/vendor/bundle/ruby/#{node[:ruby][:version]}.0" do
+    owner new_resource.user
+    group new_resource.group
+    mode "775"
+    recursive true
+  end
+
+  bundle_config "#{rails_directory}" do
+    user new_resource.user
+    group new_resource.group
+    settings "deployment" => "true",
+             "build.nokogiri" => "--use-system-libraries"
+  end
+

   bundle_install "#{rails_directory}" do
     action :nothing
   bundle_install "#{rails_directory}" do
     action :nothing

-    user "root"
-    group "root"
-    environment "NOKOGIRI_USE_SYSTEM_LIBRARIES" => "yes"
+    user new_resource.user
+    group new_resource.group
+    subscribes :run, "directory[#{rails_directory}/vendor/bundle/ruby/#{node[:ruby][:version]}.0]"

     subscribes :run, "git[#{rails_directory}]"
   end
 
     subscribes :run, "git[#{rails_directory}]"
   end