Introduce some caching for diary views.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 6cf8b261dc652b4dc6e670ad295ec39f3a24b269..4493d07a43359b5c37d2f1a8269aad00b2260796 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,20 +5,25 @@
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION

 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 

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

 # Application constants needed for routes.rb - must go before Initializer call
 # Application constants needed for routes.rb - must go before Initializer call

-API_VERSION = ENV['OSM_API_VERSION'] || '0.5'
+API_VERSION = ENV['OSM_API_VERSION'] || '0.6'

 
 # Set application status - possible settings are:
 #
 #   :online - online and operating normally
 #   :api_readonly - site online but API in read-only mode
 #   :api_offline - site online but API offline
 
 # Set application status - possible settings are:
 #
 #   :online - online and operating normally
 #   :api_readonly - site online but API in read-only mode
 #   :api_offline - site online but API offline

+#   :database_readonly - database and site in read-only mode

 #   :database_offline - database offline with site in emergency mode
 #   :database_offline - database offline with site in emergency mode

+#   :gpx_offline - gpx storage offline

 #
 OSM_STATUS = :online
 
 #
 OSM_STATUS = :online
 


@@ -37,6 +42,17 @@ Rails::Initializer.run do |config|
     config.frameworks -= [ :active_record ]
   end
 
     config.frameworks -= [ :active_record ]
   end
 

+  # 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"
+  config.gem 'composite_primary_keys', :version => '2.2.2'
+  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
+  config.gem 'rmagick', :lib => 'RMagick'
+  config.gem 'oauth', :version => '>= 0.3.6'
+  config.gem 'httpclient'
+

   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named


@@ -49,6 +65,9 @@ Rails::Initializer.run do |config|
   # (by default production uses :info, the others :debug)
   # config.log_level = :debug
 
   # (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, 
   # 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, 


@@ -63,6 +82,12 @@ 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
   # 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


@@ -72,12 +97,5 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time

-  # config.active_record.default_timezone = :utc
+  config.active_record.default_timezone = :utc

 end
 end

-
-# This has to be after the above block for some reason (doesnt pull in /lib/osm.rb?)
-POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
-
-# Use SQL (faster) or Rails (more elegant) for common Potlatch reads
-# getway speedup is approximately x2, whichways approximately x7
-POTLATCH_USE_SQL = true