Update queue selection to match live server.

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 9e8acadbaf8221d05a741f3052d3dd8831fba7a7..4d7a7f4ab2d535416f0c6da8f0240f89e03011cb 100644 (file)
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -32,7 +32,7 @@ server.errorlog = "/var/log/lighttpd/error.log"
 #
 # Allow munin to monitor the server's status
 #
-$HTTP["remoteip"] == "128.40.168.98" { 
+$HTTP["remoteip"] == "128.40.168.98" {
   status.config-url = "/server-config"
   status.status-url = "/server-status"
   status.statistics-url = "/server-statistics"
@@ -149,10 +149,13 @@ server.document-root = "/home/rails/public"
 $HTTP["useragent"] =~ "^tilesAtHome" {
   server.error-handler-404 = "/dispatch.tah"
 }
-else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints|changeset/[0-9]+/upload)$" {
+else $HTTP["url"] =~ "^/trace/[0-9]+/data$" {
   server.error-handler-404 = "/dispatch.bulkapi"
 }
-else $HTTP["url"] =~ "^/api/0\.6/.*/(full|search)$" {
+else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints|changeset/[0-9]+/(upload|download))$" {
+  server.error-handler-404 = "/dispatch.bulkapi"
+}
+else $HTTP["url"] =~ "^/api/0\.6/.*/(full|history|search|ways)$" {
   server.error-handler-404 = "/dispatch.bulkapi"
 }
 else $HTTP["url"] =~ "^/api/0\.6/" {
@@ -216,10 +219,6 @@ fastcgi.server = (
     ( "host" => "127.0.0.1", "port" => 8033, "check-local" => "disable" )
   ),
   ".api" => (
-    ( "host" => "127.0.0.1", "port" => 8030, "check-local" => "disable" ),
-    ( "host" => "127.0.0.1", "port" => 8031, "check-local" => "disable" ),
-    ( "host" => "127.0.0.1", "port" => 8032, "check-local" => "disable" ),
-    ( "host" => "127.0.0.1", "port" => 8033, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8034, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8035, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8036, "check-local" => "disable" ),
@@ -230,7 +229,11 @@ fastcgi.server = (
     ( "host" => "127.0.0.1", "port" => 8041, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8042, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8043, "check-local" => "disable" ),
-    ( "host" => "127.0.0.1", "port" => 8044, "check-local" => "disable" )
+    ( "host" => "127.0.0.1", "port" => 8044, "check-local" => "disable" ),
+    ( "host" => "127.0.0.1", "port" => 8045, "check-local" => "disable" ),
+    ( "host" => "127.0.0.1", "port" => 8046, "check-local" => "disable" ),
+    ( "host" => "127.0.0.1", "port" => 8047, "check-local" => "disable" ),
+    ( "host" => "127.0.0.1", "port" => 8048, "check-local" => "disable" )
   ),
   ".bulkapi" => (
     ( "host" => "10.0.0.10", "port" => 8000, "check-local" => "disable" ),