From efb442fe5d669732445f45c75cec855c41f4ad20 Mon Sep 17 00:00:00 2001
From: Connor Turland <connor@madhattertech.ca>
Date: Sun, 9 Dec 2012 19:34:47 -0500
Subject: [PATCH] swapped back in local/staging database file

---
 .gitignore          |  2 +-
 config/database.yml | 31 ++++++++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 56a6af2d..d72e7481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 
-/config/database.yml
+config/database.yml
 
 # Ignore bundler config
 /.bundle
diff --git a/config/database.yml b/config/database.yml
index 74caa69a..6705ca8f 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,32 +1,21 @@
 development:
   min_messages: WARNING
   adapter: postgresql
-  host: ec2-54-243-188-58.compute-1.amazonaws.com
-  port: 5442
+  host: 127.0.0.1
+  port: 5432
   encoding: unicode
-  database: da81fvorvn5pp9
+  database: metamap002_development
   pool: 5
-  username: yolhqgtlivenrk
-  password: "oi_EAZwbXboYjqB_9tWPh2x5YS"
-  
-test:
-  min_messages: WARNING
-  adapter: postgresql
-  host: ec2-54-243-188-58.compute-1.amazonaws.com
-  port: 5442
-  encoding: unicode
-  database: da81fvorvn5pp9
-  pool: 5
-  username: yolhqgtlivenrk
-  password: "oi_EAZwbXboYjqB_9tWPh2x5YS"
+  username: postgres
+  password: "3112"
 
 production:
   min_messages: WARNING
   adapter: postgresql
-  host: ec2-54-243-188-58.compute-1.amazonaws.com
-  port: 5442
+  host: ec2-107-21-107-194.compute-1.amazonaws.com
+  port: 5432
   encoding: unicode
-  database: da81fvorvn5pp9
+  database: ddcrn2lgphjk9k
   pool: 5
-  username: yolhqgtlivenrk
-  password: "oi_EAZwbXboYjqB_9tWPh2x5YS"
+  username: qqpckkahytovwv
+  password: "njeP6cMA8EjM9ukHk9s3ReOdy7"