From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Aug 2017 08:04:32 +0000 (+0100)
Subject: Fix dev instance setup script to detect db:migrate mode better
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d281d02c1cc2a2608ae050735a2a277c76df1066?hp=0acc96fee75ec4377a8bd2350420747bb88d6993

Fix dev instance setup script to detect db:migrate mode better
---

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"