From 96aaf3093cb99d383fbdbfb6ebfa778207f20ee7 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 21 Sep 2010 18:04:36 -0700
Subject: [PATCH] Make load_app_config more robust, point to the right folder
 in db seed

---
 config/initializers/_load_app_config.rb | 20 ++++++++++++--------
 db/seeds/backer.rb                      |  2 +-
 db/seeds/tom.rb                         |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb
index 034a62f24..33f7b183b 100644
--- a/config/initializers/_load_app_config.rb
+++ b/config/initializers/_load_app_config.rb
@@ -2,16 +2,20 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-raw_config = File.read("#{Rails.root}/config/app_config.yml")
-all_envs = YAML.load(raw_config)
- 
-unless all_envs
-  raw_config = File.read("#{Rails.root}/config/app_config_example.yml")
-  all_envs = YAML.load(raw_config)
+def load_config_yaml filename
+  YAML.load(File.read(filename))
 end
 
-if all_envs[Rails.env]
-  APP_CONFIG = all_envs['default'].merge(all_envs[Rails.env]).symbolize_keys
+if File.exist? "#{Rails.root}/config/app_config.yml"
+  all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml"
+  all_envs = load_config_yaml "#{Rails.root}/config/app_config_example.yml" unless all_envs
+else
+  puts "WARNING: No config/app_config.yml found! Look at config/app_config_example.yml for help."
+  all_envs = load_config_yaml "#{Rails.root}/config/app_config_example.yml"
+end
+
+if all_envs[Rails.env.to_s]
+  APP_CONFIG = all_envs['default'].merge(all_envs[Rails.env.to_s]).symbolize_keys
 else
   APP_CONFIG = all_envs['default'].symbolize_keys
 end
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 1730ee202..8fa72f23d 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -46,7 +46,7 @@ def set_app_config username
   current_config[Rails.env.to_s] ||= {}
   current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
   current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
-  file = File.new(Rails.root.join('..','shared','app_config.yml'),'w')
+  file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
   file.write(current_config.to_yaml)
   file.close
 end
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index d8152a33b..50d41eb91 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -11,7 +11,7 @@ def set_app_config username
   current_config[Rails.env.to_s] ||= {}
   current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
   current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
-  file = File.new(Rails.root.join('..','shared','app_config.yml'),'w')
+  file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
   file.write(current_config.to_yaml)
   file.close
 end