Try and make asset tagging actually work.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 3c2516ec7e8a03655ae7222b52bc1e42fabc803a..2bc029767b0e0043017e1a00e3e5577df212477a 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,12 +1,12 @@
 # Be sure to restart your web server when you modify this file.
 
+# Limit each rails process to a 512Mb resident set size
+Process.setrlimit Process::RLIMIT_AS, 640*1024*1024, Process::RLIM_INFINITY
+
 # 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"] = ''
-
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '1.2.3'
 
@@ -14,7 +14,7 @@ RAILS_GEM_VERSION = '1.2.3'
 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'
+API_VERSION = ENV['OSM_API_VERSION'] || '0.5'
 
 # Custom logger class to format messages sensibly
 class OSMLogger < Logger
@@ -74,8 +74,27 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-# Set to true to put the API in read-only mode
-API_READONLY = false
+# Hack the AssetTagHelper to make asset tagging work better
+module ActionView
+  module Helpers
+    module AssetTagHelper
+      private
+        alias :old_compute_public_path :compute_public_path
+
+        def compute_public_path(source, dir, ext)
+          path = old_compute_public_path(source, dir, ext)
+          if path =~ /(.+)\?(\d+)\??$/
+            path = "#{$1}/#{$2}"
+          end
+          path
+        end
+    end
+  end
+end
+
+# Set to :readonly to put the API in read-only mode or :offline to
+# take it completely offline
+API_STATUS = :online
 
 # Include your application configuration below
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
@@ -86,18 +105,6 @@ ActionMailer::Base.smtp_settings = {
   :domain  => 'localhost',
 } 
 
-
-# HTTP CODES
-
-# 200's
-
-HTTP_OK = 200
-
-# 400's
-
-HTTP_PRECONDITION_FAILED = 412
-HTTP_EXPECTATION_FAILED = 417
-
 #Taming FCGI
 #
 COUNT = 0