From a605ab482b4c780e8824587aece2f7a8c91c13f1 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Fri, 3 Dec 2010 15:49:34 +0100 Subject: [PATCH] made sender address in notifier.rb configurable. This fixes #657 --- app/mailers/notifier.rb | 2 +- config/app_config.yml.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb index b83c3f700..b50155c4f 100644 --- a/app/mailers/notifier.rb +++ b/app/mailers/notifier.rb @@ -1,6 +1,6 @@ class Notifier < ActionMailer::Base - default :from => "no-reply@joindiaspora.com" + default :from => APP_CONFIG[:smtp_sender_address] ATTACHMENT = File.read("#{Rails.root}/public/images/diaspora_white_on_grey.png") diff --git a/config/app_config.yml.example b/config/app_config.yml.example index 9e3f0d298..5d2617fd6 100644 --- a/config/app_config.yml.example +++ b/config/app_config.yml.example @@ -54,7 +54,7 @@ default: smtp_domain: 'example.com' # Sender address in diaspora's outgoing mail. - smtp_sender_address: 'no-reply@example.com' + smtp_sender_address: 'no-reply@joindiaspora.com' # Authentication required to send mail. Use one of 'one','plain', # 'login' or 'cram-md5'. Use 'none' if server do not support