Merge branch 'master' into openid

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index c8c874a3c9e8bea9be84a9cad3e3134bae61fa3e..7ee9e79af53732ba61efb95ab7003e1d000a31b5 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'
 
 # 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'
 
 # Application constants needed for routes.rb - must go before Initializer call
 API_VERSION = ENV['OSM_API_VERSION'] || '0.6'
 


@@ -54,9 +58,6 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
   config.gem 'httpclient'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'

-  # if Rails.env == "development"
-    config.gem 'timecop'
-  # end

 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.


@@ -87,19 +88,13 @@ Rails::Initializer.run do |config|
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :sql_session_store
 
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :sql_session_store
 

-  # We will use the old style of migrations, rather than the newer
-  # timestamped migrations that were introduced with Rails 2.1, as
-  # it will be confusing to have the numbered and timestamped migrations
-  # together in the same folder.
-  config.active_record.timestamped_migrations = false
-

   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   config.active_record.schema_format = :sql
 
   # Activate observers that should always be running
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   config.active_record.schema_format = :sql
 
   # Activate observers that should always be running

-  # config.active_record.observers = :cacher, :garbage_collector
+  config.active_record.observers = :spam_observer

 
   # 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