Merge branch 'master' into openstreetbugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 93b6e86d2a16415409fd5b0f116a0c3e7a670491..696a226e753ff7f8312918a62f9c239311698369 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -8,7 +8,7 @@ ENV['RAILS_ENV'] ||= 'production'
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
 RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL

-SERVER_URL = ENV['OSM_SERVER_URL'] || 'contributor_terms.dev.openstreetmap.org'
+SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'

 
 # Set the generator
 GENERATOR = ENV['OSM_SERVER_GENERATOR'] || 'OpenStreetMap server'
 
 # Set the generator
 GENERATOR = ENV['OSM_SERVER_GENERATOR'] || 'OpenStreetMap server'


@@ -104,4 +104,5 @@ Rails::Initializer.run do |config|
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc

+

 end
 end