Move common support code from the base migration to a library file where

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index a26cb54420075233e0347d621960320ecc5a6c98..ffd64eec9428fa2cd1ea0308b6242ef7a84bb2ed 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,13 +2,16 @@
 
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 
 # 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'
+ENV['RAILS_ENV'] ||= 'production'

 
 # Specifies gem version of Rails to use when vendor/rails is not present
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '1.1.6'
+RAILS_GEM_VERSION = '1.2.3'

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

+\r
+# Application constants needed for routes.rb - must go before Initializer call\r
+API_VERSION = ENV['OSM_API_VERSION'] || '0.4'\r

 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here


@@ -51,12 +54,31 @@ end
 # end
 
 # Include your application configuration below
 # end
 
 # Include your application configuration below

-
-API_VERSION = ENV['OSM_API_VERSION'] || '0.4'

 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 

-ActionMailer::Base.server_settings = {
+ActionMailer::Base.smtp_settings = {

   :address  => "localhost",
   :port  => 25, 
   :domain  => 'localhost',
 } 
   :address  => "localhost",
   :port  => 25, 
   :domain  => 'localhost',
 } 

+
+
+# HTTP CODES
+
+# 200's
+
+HTTP_OK = 200
+
+# 400's
+
+HTTP_PRECONDITION_FAILED = 412
+HTTP_EXPECTATION_FAILED = 417
+
+#Taming FCGI
+#
+COUNT = 0
+MAX_COUNT = 10000
+
+
+
+