X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/34fa7af72d6aa3ea6ff7c236bbd35aadcfcfc306..0ceabfe7c18d1929e3dae9730716e24a9694a70e:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index c5130a91a..ea0287a97 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -123,7 +123,7 @@ rails_port "www.openstreetmap.org" do google_openid_realm "https://www.openstreetmap.org" facebook_auth_id "427915424036881" facebook_auth_secret web_passwords["facebook_auth_secret"] - microsoft_auth_id "45ef48fb-6a13-4239-b842-133608b8edd7" + microsoft_auth_id "e34f14f1-f790-40f3-9fa4-3c5f1a027c38" microsoft_auth_secret web_passwords["microsoft_auth_secret"] github_auth_id "acf7da34edee99e35499" github_auth_secret web_passwords["github_auth_secret"] @@ -149,6 +149,7 @@ rails_port "www.openstreetmap.org" do signup_email_per_day 1 signup_email_max_burst 2 doorkeeper_signing_key web_passwords["openid_connect_key"].join("\n") + user_account_deletion_delay 7 * 24 # Requests to modify the imagery blacklist should come from the DWG only imagery_blacklist [ # Current Google imagery URLs have google or googleapis in the domain @@ -165,7 +166,10 @@ end systemd_service "rails-jobs@" do description "Rails job queue runner" type "simple" - environment "RAILS_ENV" => "production", "QUEUE" => "%I", "SLEEP_DELAY" => "60" + environment "RAILS_ENV" => "production", + "QUEUE" => "%I", + "SLEEP_DELAY" => "60", + "SECRET_KEY_BASE" => web_passwords["secret_key_base"] user "rails" working_directory rails_directory exec_start "#{node[:ruby][:bundle]} exec rails jobs:work"