From d4b4ca9166ead39999711cb47a60298b472bedff Mon Sep 17 00:00:00 2001
From: Bryce McDonnell <bryce@bridgetownint.com>
Date: Fri, 10 Aug 2012 17:11:03 -0700
Subject: [PATCH] changes default heroku config to use MongoLab instead of MongoHQ

---
 README.md                           | 4 ++--
 config/initializers/_load_config.rb | 2 +-
 config/initializers/mongo.rb        | 2 +-
 config/mongoid.mongolab.yml         | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 config/mongoid.mongolab.yml

diff --git a/README.md b/README.md
index ae4fa0d..c21e0c5 100644
--- a/README.md
+++ b/README.md
@@ -144,8 +144,8 @@ git clone http://github.com/errbit/errbit.git
 ```bash
 gem install heroku
 heroku create example-errbit --stack cedar
-heroku addons:add mongohq:free
-cp -f config/mongoid.mongohq.yml config/mongoid.yml
+heroku addons:add mongolab:starter
+cp -f config/mongoid.mongolab.yml config/mongoid.yml
 git add -f config/mongoid.yml
 git commit -m "Added mongoid config for MongoHQ"
 heroku addons:add sendgrid:starter
diff --git a/config/initializers/_load_config.rb b/config/initializers/_load_config.rb
index eff5941..30eedcc 100644
--- a/config/initializers/_load_config.rb
+++ b/config/initializers/_load_config.rb
@@ -9,7 +9,7 @@ unless defined?(Errbit::Config)
   if ENV['HEROKU']
     Errbit::Config.host = ENV['ERRBIT_HOST']
     Errbit::Config.email_from = ENV['ERRBIT_EMAIL_FROM']
-    Errbit::Config.email_at_notices = [1,3,10] #ENV['ERRBIT_EMAIL_AT_NOTICES']
+    Errbit::Config.email_at_notices = ENV['ERRBIT_EMAIL_AT_NOTICES']
     Errbit::Config.confirm_resolve_err = ENV['ERRBIT_CONFIRM_RESOLVE_ERR']
     Errbit::Config.user_has_username = ENV['ERRBIT_USER_HAS_USERNAME']
     Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER']
diff --git a/config/initializers/mongo.rb b/config/initializers/mongo.rb
index 9bd802c..30b1377 100644
--- a/config/initializers/mongo.rb
+++ b/config/initializers/mongo.rb
@@ -1,4 +1,4 @@
-if mongo = ENV['MONGOHQ_URL'] || ENV['MONGOLAB_URI']
+if mongo = ENV['MONGOLAB_URI'] || ENV['MONGOHQ_URL']
   settings = URI.parse(mongo)
   database_name = settings.path.gsub(/^\//, '')
 
diff --git a/config/mongoid.mongolab.yml b/config/mongoid.mongolab.yml
new file mode 100644
index 0000000..ade204f
--- /dev/null
+++ b/config/mongoid.mongolab.yml
@@ -0,0 +1,8 @@
+# Mongoid Configuration for MongoLab on Heroku
+# ===========================================
+#
+# Copy this file to config/mongoid.yml,
+# commit it to your repo, then push to heroku.
+
+production:
+  uri: <%= ENV['MONGOLAB_URI'] %>
--
libgit2 0.21.2