Bring configuration files ino sync with current rails default ones

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 61d068ab7b9ca256c7922331226921d491b593bd..b1e0d437e33a47747e88f4fcb024e09bfa486c62 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -38,20 +38,11 @@ Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory are automatically loaded.
-  # See Rails::Configuration for more options.
 
-  # Skip frameworks you're not going to use (only works if using vendor/rails).
-  # To use Rails without a database, you must remove the Active Record framework
-  if OSM_STATUS == :database_offline
-    config.frameworks -= [ :active_record ]
-    config.eager_load_paths = []
-  end
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
-  # Specify gems that this application depends on.
-  # They can then be installed with "rake gems:install" on new installations.
-  # config.gem "bj"
-  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-  # config.gem "aws-s3", :lib => "aws/s3"
+  # Specify gems that this application depends on and have them installed with rake gems:install
   unless  OSM_STATUS == :database_offline
     config.gem 'composite_primary_keys', :version => '2.2.2'
   end
@@ -62,45 +53,30 @@ Rails::Initializer.run do |config|
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
   config.gem 'sanitize'
 
-  # 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 (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+ 
+  # Skip frameworks you're not going to use. To use Rails without a database,
+  # you must remove the Active Record framework.
+  if OSM_STATUS == :database_offline
+    config.frameworks -= [ :active_record ]
+    config.eager_load_paths = []
+  end
 
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
+  # Activate observers that should always be running
+  config.active_record.observers = :spam_observer
 
-  # Force all environments to use the same logger level
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-
-  # Configure cache
-  config.cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
-
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random,
-  # no regular words or you'll be exposed to dictionary attacks.
-  config.action_controller.session = {
-    :key    => '_osm_session',
-    :secret => 'd886369b1e709c61d1f9fcb07384a2b96373c83c01bfc98c6611a9fe2b6d0b14215bb360a0154265cccadde5489513f2f9b8d9e7b384a11924f772d2872c2a1f'
-  }
-
-  # Use the database for sessions instead of the cookie-based default,
-  # which shouldn't be used to store highly confidential information
-  # (create the session table with 'rake db:sessions:create')
-  unless OSM_STATUS == :database_offline or OSM_STATUS == :database_readonly
-    config.action_controller.session_store = :sql_session_store
-  end
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names.
+  config.time_zone = 'UTC'
+
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :de
 
   # 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 = :spam_observer
-
-  # Make Active Record use UTC-base instead of local time
-  config.active_record.default_timezone = :utc
 end