X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/aab8b230ecdfa9674b043ad4d02b9aa2e36cd29d..ffd7b02b0c3696ffa5d38ddeeb8078df19e841e0:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 539af83b2..d9ffcc965 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -8,11 +8,15 @@ ENV['RAILS_ENV'] ||= 'production'
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
-SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
+SERVER_URL = ENV['OSM_SERVER_URL'] || 'contributor_terms.dev.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'