X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/64cefa68218b5a5d333a0747e3f3935be098bfcc..55d3ae09e912b8627faa004e8f7fb7dab5d1c7f2:/cookbooks/web/resources/rails_port.rb diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb index 385423528..3f5078d34 100644 --- a/cookbooks/web/resources/rails_port.rb +++ b/cookbooks/web/resources/rails_port.rb @@ -68,6 +68,7 @@ property :github_auth_secret, String property :wikipedia_auth_id, String property :wikipedia_auth_secret, String property :thunderforest_key, String +property :tracestrack_key, String property :totp_key, String property :csp_enforce, [true, false], :default => false property :csp_report_url, String @@ -90,6 +91,8 @@ property :signup_ip_per_day, Integer 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[ @@ -112,6 +115,7 @@ action :create do libgd-dev libarchive-dev libbz2-dev + libyaml-dev ] package %w[ @@ -325,6 +329,7 @@ action :create do "wikipedia_auth_id", "wikipedia_auth_secret", "thunderforest_key", + "tracestrack_key", "totp_key", "csp_enforce", "csp_report_url", @@ -344,7 +349,9 @@ action :create do "signup_ip_per_day", "signup_ip_max_burst", "signup_email_per_day", - "signup_email_max_burst" + "signup_email_max_burst", + "doorkeeper_signing_key", + "user_account_deletion_delay" ).compact.merge( "server_protocol" => "https", "server_url" => new_resource.site, @@ -355,7 +362,9 @@ 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 ) if new_resource.memcache_servers @@ -420,7 +429,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}]" @@ -432,7 +442,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}]" @@ -444,7 +455,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}]"