X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3fea78e419b07ef7cf57bc5ded1d65cbf679e702..0ef75fc789f0cfe4d602b9c79d5f50c1293088fc:/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..ad42b68f7 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,10 @@ 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 end