From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jun 2022 12:49:35 +0000 (+0100)
Subject: Configure the OAuth 2 application ID for iD
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/fdbe305f627ab26b604cd6b7b9a1f372083e35bd

Configure the OAuth 2 application ID for iD
---

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 8b83a9477..a32b1f582 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -112,6 +112,7 @@ rails_port "www.openstreetmap.org" do
   memcache_servers node[:web][:memcached_servers]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
+  id_application web_passwords["id_application"]
   oauth_key web_passwords["oauth_key"]
   oauth_application web_passwords["oauth_application"]
   piwik_configuration "location" => piwik[:location],
diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index c14c22842..e4e206ae5 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -51,6 +51,7 @@ property :logstash_path, String
 property :memcache_servers, Array
 property :potlatch2_key, String
 property :id_key, String
+property :id_application, String
 property :oauth_key, String
 property :oauth_application, String
 property :nominatim_url, String
@@ -221,6 +222,10 @@ action :create do
       line.gsub!(/^( *)#id_key:.*$/, "\\1id_key: \"#{new_resource.id_key}\"")
     end
 
+    if new_resource.id_application
+      line.gsub!(/^( *)#id_application:.*$/, "\\1id_application: \"#{new_resource.id_application}\"")
+    end
+
     if new_resource.oauth_key
       line.gsub!(/^( *)#oauth_key:.*$/, "\\1oauth_key: \"#{new_resource.oauth_key}\"")
     end
@@ -310,6 +315,7 @@ action :create do
     "logstash_path",
     "potlatch2_key",
     "id_key",
+    "id_application",
     "oauth_key",
     "oauth_application",
     "nominatim_url",