From 2a77f46be65691b76d8ef69b074872ac3ee03356 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 20 May 2015 14:32:17 +0100 Subject: [PATCH] Configure authentication for Facebook and Windows Live --- cookbooks/web/definitions/rails_port.rb | 10 ++++++++++ cookbooks/web/recipes/rails.rb | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index eb6bb8467..dcee9cbfe 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -210,6 +210,16 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#google_openid_realm:.*$/, "\\1google_openid_realm: \"#{params[:google_openid_realm]}\"") end + if params[:facebook_auth_id] + line.gsub!(/^( *)#facebook_auth_id:.*$/, "\\1facebook_auth_id: \"#{params[:facebook_auth_id]}\"") + line.gsub!(/^( *)#facebook_auth_secret:.*$/, "\\1facebook_auth_secret: \"#{params[:facebook_auth_secret]}\"") + end + + if params[:windowslive_auth_id] + line.gsub!(/^( *)#windowslive_auth_id:.*$/, "\\1windowslive_auth_id: \"#{params[:windowslive_auth_id]}\"") + line.gsub!(/^( *)#windowslive_auth_secret:.*$/, "\\1windowslive_auth_secret: \"#{params[:windowslive_auth_secret]}\"") + end + line.gsub!(/^( *)require_terms_seen:.*$/, "\\1require_terms_seen: true") line.gsub!(/^( *)require_terms_agreed:.*$/, "\\1require_terms_agreed: true") diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index e131d0b0c..851e41d1c 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -68,6 +68,10 @@ rails_port "www.openstreetmap.org" do google_auth_id "651529786092-6c5ahcu0tpp95emiec8uibg11asmk34t.apps.googleusercontent.com" google_auth_secret web_passwords["google_auth_secret"] google_openid_realm "https://www.openstreetmap.org" + facebook_auth_id "427915424036881" + facebook_auth_secret web_passwords["facebook_auth_secret"] + windowslive_auth_id "0000000040153C51" + windowslive_auth_secret web_passwords["windowslive_auth_secret"] nominatim_url "//poldi.openstreetmap.org/" end -- 2.39.5