configure SMTP settings through ENV vars

fixes #1231
transitland · May 16, 2018 · 77c369e · 77c369e
1 parent 8b58daa
commit 77c369e
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 23 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-Hello! Please read more about [participating in the Transitland project](https://transit.land/participate/). We welcome comments, questions, and contributions by GitHub issues or [e-mail](mailto:transitland@mapzen.com).
+Hello! Please read more about [participating in the Transitland project](https://transit.land/participate/). We welcome comments, questions, and contributions by GitHub issues or [e-mail](mailto:hello@transitland.org).
 
 ## Data import issues
 

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -1,4 +1,4 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: "transitland@mapzen.com" # TODO: change to a transit.land address
+  default from: 'hello@transitland.org'
   layout 'mailer'
 end
diff --git a/app/views/changeset_mailer/application.html.erb b/app/views/changeset_mailer/application.html.erb
@@ -6,4 +6,4 @@
 
 <p>Contributions from community members like you help us build Transitland. If you know of other feeds, please submit them, too!</p>
 
-<p>If you have any questions, you can contact the Transitland team at <a href="mailto:transitland@mapzen.com">transitland@mapzen.com</a>.</p>
+<p>If you have any questions, you can contact the Transitland team at <a href="mailto:hello@transitland.org">hello@transitland.org</a>.</p>
diff --git a/app/views/changeset_mailer/application.txt.erb b/app/views/changeset_mailer/application.txt.erb
@@ -6,4 +6,4 @@ We're starting to import the feed into the Transitland Datastore. This will make
 
 Contributions from community members like you help us build Transitland. If you know of other feeds, please submit them, too!
 
-If you have any questions, you can contact the Transitland team at transitland@mapzen.com
+If you have any questions, you can contact the Transitland team at hello@transitland.org
diff --git a/app/views/changeset_mailer/creation.html.erb b/app/views/changeset_mailer/creation.html.erb
@@ -8,4 +8,4 @@
 
 <p>You will be notified again when your feed has been added to the Feed Registry and the Datastore, or if we encounter any problems along the way.</p>
 
-<p>If you have any questions, you can contact the Transitland team at <a href="mailto:transitland@mapzen.com">transitland@mapzen.com</a>.</p>
+<p>If you have any questions, you can contact the Transitland team at <a href="mailto:hello@transitland.org">hello@transitland.org</a>.</p>
diff --git a/app/views/changeset_mailer/creation.txt.erb b/app/views/changeset_mailer/creation.txt.erb
@@ -8,4 +8,4 @@ After that, we will start importing the contents of the feed, which adds the sto
 
 You will be notified again when your feed has been added to the Feed Registry and the Datastore, or if we encounter any problems along the way.
 
-If you have any questions, you can contact the Transitland team at transitland@mapzen.com
+If you have any questions, you can contact the Transitland team at hello@transitland.org
diff --git a/config/application.rb b/config/application.rb
@@ -77,17 +77,16 @@ def self.base_url_options
     elsif Rails.env.staging? || Rails.env.production?
       # Ignore bad email addresses and do not raise email delivery errors.
       # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-      # config.action_mailer.raise_delivery_errors = false
+      config.action_mailer.raise_delivery_errors = false
 
-      # use Mandrill to send e-mail
       config.action_mailer.smtp_settings = {
-          address: "smtp.sparkpostmail.com",
-          port: 587,
+          address: Figaro.env.smtp_address,
+          port: Figaro.env.smtp_port.presence.to_i || 587,
           enable_starttls_auto: true,
-          user_name: Figaro.env.mandrill_user_name,
-          password: Figaro.env.mandrill_password,
+          user_name: Figaro.env.smtp_user_name,
+          password: Figaro.env.smtp_password,
           authentication: :plain,
-          domain: 'mapzen.com' # TODO: change to transit.land
+          domain: 'transitland.org'
         }
     end
   end

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -12,7 +12,7 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'transitland@mapzen.com'
+  config.mailer_sender = 'hello@transitland.org'
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'

diff --git a/config/sample.application.yml b/config/sample.application.yml
@@ -14,3 +14,7 @@ FEED_INFO_CACHE_EXPIRATION: '14400'
 AUTO_FETCH_FEED_VERSION: 'true'
 GTFS_TMPDIR_BASEPATH: null
 ENQUEUE_NEXT_FEED_VERSIONS_MAX: 0
+SMTP_ADDRESS: smtp.sparkpostmail.com
+SMTP_PORT: '587'
+SMTP_USER_NAME: SMTP_Injection
+SMTP_PASSWORD: XXX
diff --git a/db/sample-changesets/actransit.json b/db/sample-changesets/actransit.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/bart.json b/db/sample-changesets/bart.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/caltrain.json b/db/sample-changesets/caltrain.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/nycdotsiferry.json b/db/sample-changesets/nycdotsiferry.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/nyct.json b/db/sample-changesets/nyct.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/path.json b/db/sample-changesets/path.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/samtrans.json b/db/sample-changesets/samtrans.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/sfmta.json b/db/sample-changesets/sfmta.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/db/sample-changesets/vta.json b/db/sample-changesets/vta.json
@@ -1,7 +1,7 @@
 {
   "changeset": {
     "user": {
-      "email": "transitland@mapzen.com",
+      "email": "hello@transitland.org",
       "name": "Transitland staff",
       "user_type": "data_enthusists"
     },

diff --git a/doc/configuration.md b/doc/configuration.md
@@ -20,3 +20,7 @@ key | possible values | default | description
 `FEED_INFO_CACHE_EXPIRATION` | Any integer > 0 | 14400 seconds | Cache expiration time, in seconds, for FeedInfo results
 `AUTO_FETCH_FEED_VERSION` | `true`, `false` | `false` | Automatically run FeedFetch to create FeedVersion when a Feed is created
 `GTFS_GRAPH_VERSION` | `1`, `2` | `2` | Use legacy GTFSGraph by setting to 1. This option may be removed in the future.
+`SMTP_ADDRESS` | `smtp.sparkpostmail.com` | none | send email notifications using this SMTP service
+`SMTP_PORT` | 587 | none | port for SMTP service
+`SMTP_USER_NAME` | `SMTP_Injection` | none | user name for SMTP service
+`SMTP_PASSWORD` | your password | none | password for SMTP service