From 8f01d8e1d6719ba0e9d58161dd26204d990e54c6 Mon Sep 17 00:00:00 2001
From: Adrian Short <adrian.short@gmail.com>
Date: Fri, 22 Feb 2013 10:52:09 +0000
Subject: [PATCH] Remove mongo config; add postgres config

---
 config/database.yml | 26 ++++++++++++++++++++++++++
 config/mongo.yml    | 15 ---------------
 2 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 config/database.yml
 delete mode 100644 config/mongo.yml

diff --git a/config/database.yml b/config/database.yml
new file mode 100644
index 0000000..4904f45
--- /dev/null
+++ b/config/database.yml
@@ -0,0 +1,26 @@
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: apollo_development
+  pool: 5
+  username: postgres
+  password:
+  port: 5433
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: apollo_test
+  pool: 5
+  username: postgres
+  password: 
+  port: 5433
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
diff --git a/config/mongo.yml b/config/mongo.yml
deleted file mode 100644
index 5f11e48..0000000
--- a/config/mongo.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-defaults: &defaults
-  host: 127.0.0.1
-  port: 27017
-
-development:
-  <<: *defaults
-  database: apollo_development
-
-test:
-  <<: *defaults
-  database: apollo_test
-
-# set these environment variables on your prod server
-production:
-  uri: <%= ENV['MONGOLAB_URI'] %>