Use utility method for error reporting.

[rails.git] / config / lighttpd.conf

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 5cc3134b54b4e15b2aa48d6c28089d22a1438ce1..22051eb44657c667356d8f50b5e93a4b319407a3 100644 (file)
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -20,6 +20,8 @@ server.username = "www-data"
 server.groupname = "www-data"
 server.pid-file = "/var/run/lighttpd.pid"
 
 server.groupname = "www-data"
 server.pid-file = "/var/run/lighttpd.pid"
 

+server.max-fds = 8192
+

 #
 # Setup logging
 #
 #
 # Setup logging
 #


@@ -58,7 +60,7 @@ evasive.max-conns-per-ip = 20
 mimetype.assign = (
   ".css" => "text/css",
   ".gif" => "image/gif",
 mimetype.assign = (
   ".css" => "text/css",
   ".gif" => "image/gif",

-  ".html" => "text/html",
+  ".html" => "text/html; charset=utf-8",

   ".js" => "application/x-javascript",
   ".png" => "image/png",
   ".swf" => "application/x-shockwave-flash",
   ".js" => "application/x-javascript",
   ".png" => "image/png",
   ".swf" => "application/x-shockwave-flash",


@@ -124,13 +126,13 @@ server.document-root = "/home/rails/public"
 $HTTP["useragent"] == "tilesAtHome" {
   server.error-handler-404 = "/dispatch.tah"
 }
 $HTTP["useragent"] == "tilesAtHome" {
   server.error-handler-404 = "/dispatch.tah"
 }

-else $HTTP["url"] =~ "^/api/0\.5/(map|trackpoints|amf|amf/read|swf/trackpoints)$" {
+else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints)$" {

   server.error-handler-404 = "/dispatch.bulkapi"
 }
   server.error-handler-404 = "/dispatch.bulkapi"
 }

-else $HTTP["url"] =~ "^/api/0\.5/.*/search$" {
+else $HTTP["url"] =~ "^/api/0\.6/.*/search$" {

   server.error-handler-404 = "/dispatch.bulkapi"
 }
   server.error-handler-404 = "/dispatch.bulkapi"
 }

-else $HTTP["url"] =~ "^/api/0\.5/" {
+else $HTTP["url"] =~ "^/api/0\.6/" {

   server.error-handler-404 = "/dispatch.api"
 }
 else $HTTP["url"] =~ "^/api/0\.[0-9]+/" {
   server.error-handler-404 = "/dispatch.api"
 }
 else $HTTP["url"] =~ "^/api/0\.[0-9]+/" {