Merge remote-tracking branch 'github/pull/740'

[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 60c9cbbec122c049d33d94783d0289d68f56e789..6816904521e6f8a5ddcf1b81afe9d1f72d24de02 100644 (file)
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -92,6 +92,7 @@ property :signup_ip_max_burst, Integer
 property :signup_email_per_day, Integer
 property :signup_email_max_burst, Integer
 property :doorkeeper_signing_key, String
 property :signup_email_per_day, Integer
 property :signup_email_max_burst, Integer
 property :doorkeeper_signing_key, String

+property :user_account_deletion_delay, Integer

 
 action :create do
   package %W[
 
 action :create do
   package %W[


@@ -114,6 +115,7 @@ action :create do
     libgd-dev
     libarchive-dev
     libbz2-dev
     libgd-dev
     libarchive-dev
     libbz2-dev

+    libyaml-dev

   ]
 
   package %w[
   ]
 
   package %w[


@@ -348,7 +350,8 @@ action :create do
     "signup_ip_max_burst",
     "signup_email_per_day",
     "signup_email_max_burst",
     "signup_ip_max_burst",
     "signup_email_per_day",
     "signup_email_max_burst",

-    "doorkeeper_signing_key"
+    "doorkeeper_signing_key",
+    "user_account_deletion_delay"

   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,
   ).compact.merge(
     "server_protocol" => "https",
     "server_url" => new_resource.site,


@@ -359,7 +362,11 @@ action :create do
     "max_request_area" => node[:web][:max_request_area],
     "max_number_of_nodes" => node[:web][:max_number_of_nodes],
     "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],
     "max_request_area" => node[:web][:max_request_area],
     "max_number_of_nodes" => node[:web][:max_number_of_nodes],
     "max_number_of_way_nodes" => node[:web][:max_number_of_way_nodes],

-    "max_number_of_relation_members" => node[:web][:max_number_of_relation_members]
+    "max_number_of_relation_members" => node[:web][:max_number_of_relation_members],
+    "oauth_10_support" => false,
+    "oauth_10_registration" => false,
+    "oauth_10a_support" => false,
+    "basic_auth_support" => false

   )
 
   if new_resource.memcache_servers
   )
 
   if new_resource.memcache_servers


@@ -401,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
 


@@ -424,7 +445,8 @@ action :create do
     directory rails_directory
     command "rails yarn:install"
     environment "HOME" => rails_directory,
     directory rails_directory
     command "rails yarn:install"
     environment "HOME" => rails_directory,

-                "RAILS_ENV" => "production"
+                "RAILS_ENV" => "production",
+                "SECRET_KEY_BASE_DUMMY" => "1"

     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"


@@ -436,7 +458,8 @@ action :create do
     directory rails_directory
     command "rails i18n:js:export"
     environment "HOME" => rails_directory,
     directory rails_directory
     command "rails i18n:js:export"
     environment "HOME" => rails_directory,

-                "RAILS_ENV" => "production"
+                "RAILS_ENV" => "production",
+                "SECRET_KEY_BASE_DUMMY" => "1"

     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"


@@ -448,7 +471,8 @@ action :create do
     directory rails_directory
     command "rails assets:precompile"
     environment "HOME" => rails_directory,
     directory rails_directory
     command "rails assets:precompile"
     environment "HOME" => rails_directory,

-                "RAILS_ENV" => "production"
+                "RAILS_ENV" => "production",
+                "SECRET_KEY_BASE_DUMMY" => "1"

     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"
     user new_resource.user
     group new_resource.group
     subscribes :run, "git[#{rails_directory}]"