Configure the OAuth 2 application ID for iD

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 8b83a9477d2a05776b169fd39342af5ec6249a7b..a32b1f582f31523ee7bb12322f209098b25c42ba 100644 (file)
--- 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"]
   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],
   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 c14c22842f150d045a4eccf037560bc1846a2615..e4e206ae534a455027cd34f7937fca6faa7495ac 100644 (file)
--- 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 :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
 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
 
       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
     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",
     "logstash_path",
     "potlatch2_key",
     "id_key",

+    "id_application",

     "oauth_key",
     "oauth_application",
     "nominatim_url",
     "oauth_key",
     "oauth_application",
     "nominatim_url",