Make "all traces" and "your traces" links more consistent

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index b1e0d437e33a47747e88f4fcb024e09bfa486c62..15ec2457937e0c22ea18806c175d12dff83bd21a 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,36 +1,8 @@
 # Be sure to restart your server when you modify this file
 
 # Be sure to restart your server when you modify this file
 

-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-ENV['RAILS_ENV'] ||= 'production'
-

 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 

-# Set the server URL
-SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
-
-# 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'
-
-# 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
-#   :gpx_offline - gpx storage offline
-#
-OSM_STATUS = :online
-

 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 


@@ -43,15 +15,20 @@ Rails::Initializer.run do |config|
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
   # Specify gems that this application depends on and have them installed with rake gems:install
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
   # Specify gems that this application depends on and have them installed with rake gems:install

-  unless  OSM_STATUS == :database_offline
+  unless  STATUS == :database_offline

     config.gem 'composite_primary_keys', :version => '2.2.2'
   end
     config.gem 'composite_primary_keys', :version => '2.2.2'
   end

-  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
+  config.gem 'libxml-ruby', :version => ['>= 1.1.1', ' < 2.0.0'], :lib => 'libxml'

   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'rmagick', :lib => 'RMagick'

-  config.gem 'oauth', :version => '>= 0.3.6'
+  config.gem 'oauth', :version => '>= 0.4.3'
+  config.gem 'oauth-plugin', :version => '0.3.14'

   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'

+  config.gem 'i18n', :version => '>= 0.5.0'
+  if defined?(MEMCACHE_SERVERS)
+    config.gem 'memcached'
+  end

 
   # 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
 
   # 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


@@ -59,7 +36,7 @@ Rails::Initializer.run do |config|
  
   # Skip frameworks you're not going to use. To use Rails without a database,
   # you must remove the Active Record framework.
  
   # 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
+  if STATUS == :database_offline

     config.frameworks -= [ :active_record ]
     config.eager_load_paths = []
   end
     config.frameworks -= [ :active_record ]
     config.eager_load_paths = []
   end