cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move email configuration out of the model and into the config file

Browse source
This commit is contained in:
Andy Allan 2010-05-01 12:36:22 +01:00
parent 4ef2cb9a71
commit cd89a3c662
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/notifier.rb
View file

@ -99,8 +99,8 @@ private
def common_headers(recipient)
recipients recipient.email
locale recipient.preferred_language_from(I18n.available_locales)
from "OpenStreetMap <webmaster@openstreetmap.org>"
headers "return-path" => "bounces@openstreetmap.org",
from EMAIL_FROM
headers "return-path" => EMAIL_RETURN_PATH,
"Auto-Submitted" => "auto-generated"
end

4
config/environment.rb
View file

@ -13,6 +13,10 @@ SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
# Set the generator
GENERATOR = ENV['OSM_SERVER_GENERATOR'] || 'OpenStreetMap server'
# Settings for generated emails (e.g. signup confirmation
EMAIL_FROM = ENV['OSM_EMAIL_FROM'] || 'OpenStreetMap <webmaster@openstreetmap.org>'
EMAIL_RETURN_PATH = ENV['OSM_EMAIL_RETURN_PATH'] || 'bounces@openstreetmap.org'
# Application constants needed for routes.rb - must go before Initializer call
API_VERSION = ENV['OSM_API_VERSION'] || '0.6'