From 6ff94e67b3b404965625e298bb1a5704b5b6ea0d Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 25 Oct 2010 17:26:07 -0700
Subject: [PATCH] remove unused fb_config.yml files.  removed oauth_keys.yml
 from git, updated .example"

---
 config/fb_config.yml                  | 4 ----
 config/fb_config.yml.example          | 4 ----
 config/initializers/_load_services.rb | 3 ++-
 config/oauth_keys.yml                 | 6 ------
 config/oauth_keys.yml.example         | 3 +++
 5 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 config/fb_config.yml
 delete mode 100644 config/fb_config.yml.example
 delete mode 100644 config/oauth_keys.yml

diff --git a/config/fb_config.yml b/config/fb_config.yml
deleted file mode 100644
index 4c3309fac..000000000
--- a/config/fb_config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-fb_api_key: {dcf4e90df086cf6d3e531b31e043ff32}
-fb_secret: {7fe864834726f8a5e65bc93928b99a53}
-fb_app_id: {120373411325347}
-host: http://localhost:3000/
diff --git a/config/fb_config.yml.example b/config/fb_config.yml.example
deleted file mode 100644
index 5bb145316..000000000
--- a/config/fb_config.yml.example
+++ /dev/null
@@ -1,4 +0,0 @@
-fb_api_key: {key}
-fb_secret: {secret}
-fb_app_id: {app_id}
-host: http://localhost:3000/
diff --git a/config/initializers/_load_services.rb b/config/initializers/_load_services.rb
index d65f2a695..ef41d75a7 100644
--- a/config/initializers/_load_services.rb
+++ b/config/initializers/_load_services.rb
@@ -10,6 +10,7 @@ oauth_keys_file = "#{Rails.root}/config/oauth_keys.yml"
 
 if File.exist? oauth_keys_file
   SERVICES = load_config_yaml(oauth_keys_file)
-  SERVICES ||= load_config_yaml("#{oauth_keys_file}.example")
 end
 
+SERVICES ||= load_config_yaml("#{oauth_keys_file}.example")
+
diff --git a/config/oauth_keys.yml b/config/oauth_keys.yml
deleted file mode 100644
index c3dc20afd..000000000
--- a/config/oauth_keys.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-twitter:
-  consumer_key: no69jTnL5SCOnWgk5XWqbQ
-  consumer_secret: 2DZyu8DA43AIeFsRVdz8OtAHLvCtPjdRKdNO3UZGqWM
-facebook:
-  app_id: 120373411325347
-  app_secret: 7fe864834726f8a5e65bc93928b99a53
diff --git a/config/oauth_keys.yml.example b/config/oauth_keys.yml.example
index 3397b2832..8e1db632a 100644
--- a/config/oauth_keys.yml.example
+++ b/config/oauth_keys.yml.example
@@ -1,3 +1,6 @@
 twitter:
   consumer_key: ""
   consumer_secret: ""
+facebook:
+  app_id: ""
+  app_secret: ""