Bring configuration files ino sync with current rails default ones

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.
   # 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
   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'
 
   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 ]
   # :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
 
   # 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
 end

diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb295b83f17285331882dfdc0eebddaecf32f773..5e549a91f73f920b43bffb544fae3a84f0af92f4 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,15 +4,25 @@
 # Code is not reloaded between requests
 config.cache_classes = true
 
 # Code is not reloaded between requests
 config.cache_classes = true
 

-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
-

 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true

+config.action_view.cache_template_loading            = true
+
+# See everything in the log (default is :info)
+# config.log_level = :debug
+
+# Use a different logger for distributed setups
+# config.logger = SyslogLogger.new
+
+# Use a different cache store in production
+# config.cache_store = :mem_cache_store

 
 # Enable serving of images, stylesheets, and javascripts from an asset server
 
 # Enable serving of images, stylesheets, and javascripts from an asset server

-# config.action_controller.asset_host                  = "http://assets.example.com"
+# config.action_controller.asset_host = "http://assets.example.com"

 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
 
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false

+
+# Enable threaded mode
+# config.threadsafe!

diff --git a/config/environments/test.rb b/config/environments/test.rb
index a26b6ef9293ec2d155060ab1cad92668723c122e..44dd2992bb8431224ff2f2d15a8a913ecb6e4d2c 100644 (file)
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -12,6 +12,7 @@ config.whiny_nils = true
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false

+config.action_view.cache_template_loading            = true

 
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false
 
 # Disable request forgery protection in test environment
 config.action_controller.allow_forgery_protection    = false

diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
new file mode 100644 (file)
index 0000000..c2169ed
--- /dev/null
+++ b/config/initializers/backtrace_silencers.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!
\ No newline at end of file

diff --git a/config/initializers/cookie_verification_secret.rb b/config/initializers/cookie_verification_secret.rb
new file mode 100644 (file)
index 0000000..81edec3
--- /dev/null
+++ b/config/initializers/cookie_verification_secret.rb
@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies 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.
+ActionController::Base.cookie_verifier_secret = '67881c9e6670d9b55b43885ea8eab34e32865ce436bdbde73e1967a11a26674906736de0aa1a0d24edf8ebcb653e1735413e6fd24e1201338e397d4a2392c614';

diff --git a/config/initializers/new_rails_defaults.rb b/config/initializers/new_rails_defaults.rb
new file mode 100644 (file)
index 0000000..c94db0a
--- /dev/null
+++ b/config/initializers/new_rails_defaults.rb
@@ -0,0 +1,21 @@
+# Be sure to restart your server when you modify this file.
+
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
+
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+ActionController::Routing.generate_best_match = false
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false
\ No newline at end of file

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
new file mode 100644 (file)
index 0000000..8ab0007
--- /dev/null
+++ b/config/initializers/session_store.rb
@@ -0,0 +1,17 @@
+# Be sure to restart your server when you modify this file.
+
+# 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.
+ActionController::Base.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
+  ActionController::Base.session_store = :sql_session_store
+end