X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9f5e4b2b5ad843b960005f25dc6ad3a5cd8822cb..7f955a4aca277350a70bb95f0ca97e64d7d808c4:/config/environment.rb?ds=inline

diff --git a/config/environment.rb b/config/environment.rb
index 45d03d2ad..6d6c952fb 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,96 +1,56 @@
-# Be sure to restart your web 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'
-
-# Don't add asset tags
-ENV["RAILS_ASSET_ID"] = ''
+# Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '1.2.3'
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
-# Application constants needed for routes.rb - must go before Initializer call
-API_VERSION = ENV['OSM_API_VERSION'] || '0.4'
-
-# Custom logger class to format messages sensibly
-class OSMLogger < Logger
-  def format_message(severity, time, progname, msg)
-    "[%s.%06d #%d] %s\n" % [time.strftime("%Y-%m-%d %H:%M:%S"), time.usec, $$, msg.sub(/^\n+/, "")]
-  end
-end
-
 Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence those specified here
-  
-  # Skip frameworks you're not going to use
-  # config.frameworks -= [ :action_web_service, :action_mailer ]
+  # 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.
 
   # Add additional load paths for your own custom dirs
   # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
-  # Force all environments to use the same logger level 
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
+  # Specify gems that this application depends on and have them installed with rake gems:install
+  unless  STATUS == :database_offline
+    config.gem 'composite_primary_keys', :version => '2.2.2'
+  end
+  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
+  config.gem 'rmagick', :lib => 'RMagick'
+  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 'i18n', :version => '>= 0.4.1'
+
+  # 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 STATUS == :database_offline
+    config.frameworks -= [ :active_record ]
+    config.eager_load_paths = []
+  end
 
-  # Use our custom logger
-  config.logger = OSMLogger.new(config.log_path)
-  config.logger.level = Logger.const_get(config.log_level.to_s.upcase)
+  # Activate observers that should always be running
+  config.active_record.observers = :spam_observer
 
-  # Use the database for sessions instead of the file system
-  # (create the session table with 'rake db:sessions:create')
-  # config.action_controller.session_store = :sql_session_store
+  # 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'
 
-  # Unfortunately SqlSessionStore is a plugin which has not been
-  # loaded yet, so we have to do things the hard way...
-  config.after_initialize do
-    ActionController::Base.session_store = :sql_session_store
-    SqlSessionStore.session_class = MysqlSession
-  end
+  # 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, 
+  # 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
-
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-  
-  # See Rails::Configuration for more options
 end
-
-# Add new inflection rules using the following format 
-# (all these examples are active by default):
-# Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# Set to true to put the API in read-only mode
-API_READONLY = false
-
-# Include your application configuration below
-SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
-
-ActionMailer::Base.smtp_settings = {
-  :address  => "localhost",
-  :port  => 25, 
-  :domain  => 'localhost',
-} 
-
-#Taming FCGI
-#
-COUNT = 0
-MAX_COUNT = 10000
-
-
-
-