X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3fea78e419b07ef7cf57bc5ded1d65cbf679e702..73b6a23522bc1e09a414f095b3c9cd9f4a7593b1:/cookbooks/dev/templates/default/rails.setup.rb.erb diff --git a/cookbooks/dev/templates/default/rails.setup.rb.erb b/cookbooks/dev/templates/default/rails.setup.rb.erb index 1539fb7e6..c25ea13e2 100644 --- a/cookbooks/dev/templates/default/rails.setup.rb.erb +++ b/cookbooks/dev/templates/default/rails.setup.rb.erb @@ -17,7 +17,11 @@ OpenStreetMap::Application.config.after_initialize do id.save! end - ID_KEY = id.key + if Kernel.const_defined?("Settings") + Settings.id_key = id.key + else + ID_KEY = id.key + end unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2") potlatch = webmaster.client_applications.new @@ -27,7 +31,11 @@ OpenStreetMap::Application.config.after_initialize do potlatch.save! end - POTLATCH2_KEY = potlatch.key + if Kernel.const_defined?("Settings") + Settings.potlatch2_key = potlatch.key + else + POTLATCH2_KEY = potlatch.key + end unless website = webmaster.client_applications.find_by_name("Web Site") website = webmaster.client_applications.new @@ -37,6 +45,42 @@ OpenStreetMap::Application.config.after_initialize do website.save! end - OAUTH_KEY = website.key + if Kernel.const_defined?("Settings") + Settings.oauth_key = website.key + else + OAUTH_KEY = website.key + end + end + + if ActiveRecord::Base.connection.table_exists?(:oauth_applications) + unless id = webmaster.oauth2_applications.find_by_name("iD") + id = webmaster.oauth2_applications.new + id.name = "iD" + id.redirect_uri = "https://<%= @site %>/id" + id.scopes = Oauth.scopes.map(&:name) + id.confidential = true + id.save! + end + + if Kernel.const_defined?("Settings") + Settings.id_application = id.uid + else + ID_APPLICATION = id.uid + end + + unless website = webmaster.oauth2_applications.find_by_name("Web Site") + website = webmaster.oauth2_applications.new + website.name = "Web Site" + website.redirect_uri = "https://<%= @site %>/" + website.scopes = Oauth.scopes.map(&:name) + website.confidential = true + website.save! + end + + if Kernel.const_defined?("Settings") + Settings.oauth_application = website.uid + else + OAUTH_APPLICATION = website.uid + end end end