# HG changeset patch
# User nanaya <me@myconan.net>
# Date 1467447487 -32400
# Node ID a5eae5b07abf56084d4c07b46f1695bbd83b0ef3
# Parent  d31fe32da7a0cec984ede11aa32130f834e7ea4a
Prepare for removing custom database.yml

diff -r d31fe32da7a0 -r a5eae5b07abf config/application.rb
--- a/config/application.rb	Sat Jul 02 17:04:25 2016 +0900
+++ b/config/application.rb	Sat Jul 02 17:18:07 2016 +0900
@@ -3,14 +3,14 @@
 # To allow setting environment variable ZP_DATABASE_URL instead of DATABASE_URL.
 ENV["DATABASE_URL"] = ENV["ZP_DATABASE_URL"] if ENV["ZP_DATABASE_URL"]
 
+require_relative "config_init"
+
 require "active_record/railtie"
 require "action_controller/railtie"
 # require "action_mailer/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
-require_relative "config_init"
-
 # If you precompile assets before deploying to production, use this line
 Bundler.require(*$cfg[:bundler_groups])
 # If you want your assets lazily compiled in production, use this line
diff -r d31fe32da7a0 -r a5eae5b07abf config/config_init.rb
--- a/config/config_init.rb	Sat Jul 02 17:04:25 2016 +0900
+++ b/config/config_init.rb	Sat Jul 02 17:18:07 2016 +0900
@@ -2,7 +2,8 @@
 $cfg[:secret_key] = ENV["ZP_SECRET_KEY"]
 $cfg[:newrelic] = ENV["ZP_NEWRELIC"] == 1
 
-config_local = File.expand_path("config_local_#{Rails.env}.rb", __dir__)
+env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+config_local = File.expand_path("config_local_#{env}.rb", __dir__)
 
 require config_local if File.exist? config_local
 
@@ -10,7 +11,7 @@
 $cfg[:newrelic] = false if $cfg[:newrelic].nil?
 $cfg[:log_to_stdout] = true if $cfg[:log_to_stdout].nil?
 
-$cfg[:bundler_groups] ||= [:default, Rails.env]
+$cfg[:bundler_groups] ||= [:default, env]
 $cfg[:bundler_groups] << "standalone" if $cfg[:standalone]
 $cfg[:bundler_groups] << "newrelic" if $cfg[:newrelic]