Merge branch 'master' of git://git.openstreetmap.org/rails into openID

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 01115ba97fb17133e9e47eb38cb829faac36ba50..7f9343ce0b3181a57060f0f61e7005f9d38bcbf1 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -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'