Skip to content

Commit

Permalink
Switched to Sendgrid from Mandrill
Browse files Browse the repository at this point in the history
  • Loading branch information
christiankaiser committed Apr 24, 2016
1 parent dfb3952 commit aca243d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Capistrano runs on your local machine and uses SSH to perform the deployment on

### Performing a graceful deployment (no migrations)

This will deploy the latest code from `development`. Make sure to `git push` your changes first, or they will not apply.
This will deploy the latest code from `master`. Make sure to `git push` your changes first, or they will not apply.

```
bundle exec cap production deploy
Expand Down
4 changes: 2 additions & 2 deletions config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

set :mb_dotenv_keys, %w(
rails_secret_key_base
mandrill_username
mandrill_api_key
rollbar_access_token
sidekiq_web_username
sidekiq_web_password
sendgrid_username
sendgrid_password
)

# Re-index items on every deploy, just to be safe
Expand Down
8 changes: 4 additions & 4 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false

# Production Mandrill SMTP config
# Production Sendgrid SMTP config
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
:address => "smtp.mandrillapp.com",
:address => "smtp.sendgrid.net",
:port => 587,
:enable_starttls_auto => true,
:user_name => ENV.fetch("MANDRILL_USERNAME"),
:password => ENV.fetch("MANDRILL_API_KEY"),
:user_name => ENV.fetch("SENDGRID_USERNAME"),
:password => ENV.fetch("SENDGRID_PASSWORD"),
:authentication => "login",
:domain => "catima.unil.ch"
}
Expand Down

0 comments on commit aca243d

Please sign in to comment.