From fd9e06a47d65cdf929fb48d66a7dda2286c107a8 Mon Sep 17 00:00:00 2001
From: Damien Mathieu <42@dmathieu.com>
Date: Thu, 6 Dec 2012 11:31:42 +0100
Subject: [PATCH] let us use a smtp server other than sendgrid

---
 README.md                           |  3 +++
 config/initializers/_load_config.rb | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d0ee698..76ad8ed 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,9 @@ heroku addons:add sendgrid:starter
 heroku config:add HEROKU=true
 heroku config:add ERRBIT_HOST=some-hostname.example.com
 heroku config:add ERRBIT_EMAIL_FROM=example@example.com
+heroku config:add SMTP_SERVER=smtp.sendgrid.net
+heroku config:add SMTP_USERNAME=the-username-provided-by-sendgrid
+heroku config:add SMTP_PASSWORD=the-password-provided-by-sendgrid
 git push heroku master
 ```
 
diff --git a/config/initializers/_load_config.rb b/config/initializers/_load_config.rb
index 4ead497..4e97952 100644
--- a/config/initializers/_load_config.rb
+++ b/config/initializers/_load_config.rb
@@ -24,12 +24,12 @@ unless defined?(Errbit::Config)
     Errbit::Config.github_access_scope = ENV['GITHUB_ACCESS_SCOPE'].split(',').map(&:strip) if ENV['GITHUB_ACCESS_SCOPE']
 
     Errbit::Config.smtp_settings = {
-      :address        => "smtp.sendgrid.net",
-      :port           => "25",
+      :address        => ENV['SMTP_SERVER'],
+      :port           => ENV['SMTP_PORT'] || 25,
       :authentication => :plain,
-      :user_name      => ENV['SENDGRID_USERNAME'],
-      :password       => ENV['SENDGRID_PASSWORD'],
-      :domain         => ENV['SENDGRID_DOMAIN']
+      :user_name      => ENV['SMTP_USERNAME'],
+      :password       => ENV['SMTP_PASSWORD'],
+      :domain         => ENV['ERRBIT_EMAIL_FROM'].split('@').last
     }
   end
 
--
libgit2 0.21.2