Browse Source

This adds ADMIN_EMAIL for those places in the code where godwin's email address was hardcoded.

Jonathan Rosenbaum 3 years ago
parent
commit
cdddb0dc7a
  1. 2
      app/controllers/application_controller.rb
  2. 4
      app/mailers/user_mailer.rb
  3. 1
      docker-compose.yml

2
app/controllers/application_controller.rb

@ -213,7 +213,7 @@ class ApplicationController < BaseController
end end
def contact_send def contact_send
email_list = ['Godwin <goodgodwin@hotmail.com>'] email_list = [ENV['ADMIN_EMAIL']]
if params[:reason] == 'conference' && logged_in? if params[:reason] == 'conference' && logged_in?

4
app/mailers/user_mailer.rb

@ -163,12 +163,12 @@ class UserMailer < ActionMailer::Base
@request = request @request = request
@params = params @params = params
mail to: 'goodgodwin@hotmail.com', subject: clean_subject("Details for: \"#{subject}\"") mail to: ENV['ADMIN_EMAIL'], subject: clean_subject("Details for: \"#{subject}\"")
end end
def server_startup(environment) def server_startup(environment)
@environment = environment @environment = environment
mail to: 'goodgodwin@hotmail.com', subject: clean_subject("Deployment to #{environment} complete") mail to: ENV['ADMIN_EMAIL'], subject: clean_subject("Deployment to #{environment} complete")
end end
private private

1
docker-compose.yml

@ -58,6 +58,7 @@ services:
- SMTP_USER_NAME=${SMTP_USER_NAME:-info@bikebike.org} - SMTP_USER_NAME=${SMTP_USER_NAME:-info@bikebike.org}
- SMTP_PASSWORD=${SMTP_PASSWORD:-fake} - SMTP_PASSWORD=${SMTP_PASSWORD:-fake}
- SMTP_SSL=${SMTP_SSL:-false} - SMTP_SSL=${SMTP_SSL:-false}
- ADMIN_EMAIL=${ADMIN_EMAIL:-info@bikebike.org}
- DEFAULT_URL=${DEFAULT_URL:-bikebike.org} - DEFAULT_URL=${DEFAULT_URL:-bikebike.org}
volumes: volumes:
- bikebikebike:/app/BikeBike - bikebikebike:/app/BikeBike

Loading…
Cancel
Save