From d281d02c1cc2a2608ae050735a2a277c76df1066 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 18 Aug 2017 09:04:32 +0100 Subject: [PATCH] Fix dev instance setup script to detect db:migrate mode better --- cookbooks/dev/templates/default/rails.setup.rb.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/dev/templates/default/rails.setup.rb.erb b/cookbooks/dev/templates/default/rails.setup.rb.erb index 3902af477..d42408f9e 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" -- 2.43.2