From 04eaf4f0434ef02439b6a32a20c6e7c7a772baf1 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Fri, 7 Dec 2012 00:14:06 +1300 Subject: [PATCH] Use sendgrid as default email service, but allow developers to override SMTP settings with SMTP_* vars --- README.md | 3 --- config/initializers/_load_config.rb | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 76ad8ed..d0ee698 100644 --- a/README.md +++ b/README.md @@ -157,9 +157,6 @@ 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 4e97952..d5ff345 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 => ENV['SMTP_SERVER'], - :port => ENV['SMTP_PORT'] || 25, + :address => ENV['SMTP_SERVER'] || 'smtp.sendgrid.net', + :port => ENV['SMTP_PORT'] || 25, :authentication => :plain, - :user_name => ENV['SMTP_USERNAME'], - :password => ENV['SMTP_PASSWORD'], - :domain => ENV['ERRBIT_EMAIL_FROM'].split('@').last + :user_name => ENV['SMTP_USERNAME'] || ENV['SENDGRID_USERNAME'], + :password => ENV['SMTP_PASSWORD'] || ENV['SENDGRID_PASSWORD'], + :domain => ENV['SENDGRID_DOMAIN'] || ENV['ERRBIT_EMAIL_FROM'].split('@').last } end -- libgit2 0.21.2