X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fd7f63d8a548c1d25c35021e0ce5bf4f3c177fd1..63ba78d9bd1c0f6e9c7b45dca066a9ce3eb03ee6:/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 3902af477..1539fb7e6 100644 --- a/cookbooks/dev/templates/default/rails.setup.rb.erb +++ b/cookbooks/dev/templates/default/rails.setup.rb.erb @@ -1,5 +1,5 @@ -unless Object.const_defined?(:Rake) or Object.const_defined?(:POTLATCH2_KEY) - OpenStreetMap::Application.config.after_initialize do +OpenStreetMap::Application.config.after_initialize do + if ActiveRecord::Base.connection.table_exists?(:client_applications) unless webmaster = User.find_by_email("webmaster@openstreetmap.org") webmaster = User.new webmaster.display_name = "OpenStreetMap Webmaster" @@ -12,7 +12,7 @@ unless Object.const_defined?(:Rake) or Object.const_defined?(:POTLATCH2_KEY) unless id = webmaster.client_applications.find_by_name("iD") id = webmaster.client_applications.new id.name = "iD" - id.url = "http://<%= @site %>/" + id.url = "https://<%= @site %>/" ClientApplication.all_permissions.each { |p| id[p] = true } id.save! end @@ -22,7 +22,7 @@ unless Object.const_defined?(:Rake) or Object.const_defined?(:POTLATCH2_KEY) unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2") potlatch = webmaster.client_applications.new potlatch.name = "Potlatch 2" - potlatch.url = "http://<%= @site %>/" + potlatch.url = "https://<%= @site %>/" ClientApplication.all_permissions.each { |p| potlatch[p] = true } potlatch.save! end @@ -32,7 +32,7 @@ unless Object.const_defined?(:Rake) or Object.const_defined?(:POTLATCH2_KEY) unless website = webmaster.client_applications.find_by_name("Web Site") website = webmaster.client_applications.new website.name = "Web Site" - website.url = "http://<%= @site %>/" + website.url = "https://<%= @site %>/" ClientApplication.all_permissions.each { |p| website[p] = true } website.save! end