From b8e4d214fd9b91ee2aa94dc0747f3cfeb61fb8dd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 2 Jan 2017 20:44:37 +0000 Subject: [PATCH] Configure TOTP key for the web site --- cookbooks/web/definitions/rails_port.rb | 4 ++++ cookbooks/web/recipes/rails.rb | 1 + 2 files changed, 5 insertions(+) diff --git a/cookbooks/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index 06a68504b..bbc3d60d9 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -204,6 +204,10 @@ define :rails_port, :action => [:create, :enable] do line.gsub!(/^( *)#thunderforest_key:.*$/, "\\1thunderforest_key: \"#{params[:thunderforest_key]}\"") end + if params[:totp_key] + line.gsub!(/^( *)#totp_key:.*$/, "\\1totp_key: \"#{params[:totp_key]}\"") + 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 d58026ca3..90efbb421 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -80,6 +80,7 @@ rails_port "www.openstreetmap.org" do wikipedia_auth_secret web_passwords["wikipedia_auth_secret"] mapzen_valhalla_key web_passwords["mapzen_valhalla_key"] thunderforest_key web_passwords["thunderforest_key"] + totp_key web_passwords["totp_key"] end package "libjson-xs-perl" -- 2.43.2