Add IPv6 addresses to dulcy

[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 7cb82631a1e7f97ed59c8e7a388a81db695e51a0..debc4db50c1133d3f9f66f0a22567cc0a7606f9d 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 :user_account_deletion_delay, Integer
 
 action :create do
   package %W[
@@ -349,7 +350,8 @@ action :create do
     "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,
@@ -360,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_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
@@ -425,7 +431,8 @@ action :create do
     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}]"
@@ -437,7 +444,8 @@ action :create do
     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}]"
@@ -449,7 +457,8 @@ action :create do
     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}]"