X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6a96c72e81cc15a65c4c3960d28257fd44bc17c7..9e03b38288cb72b194fb97402673d72b204433b1:/config/lighttpd.conf

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 4735003d7..3befa5c87 100644
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -49,6 +49,14 @@ $HTTP["remoteip"] == "143.210.16.160" { url.access-deny = ("") }
 #
 #$HTTP["useragent"] == "tilesAtHome" { url.access-deny = ("") }
 
+#
+# Block JOSM revisions  1722-1727 as they have a serious bug that causes
+# lat/lon to be swapped (http://josm.openstreetmap.de/ticket/2804)
+#
+$HTTP["useragent"] =~ "^JOSM/[0-9]+\.[0-9]+ \(172[234567] " {
+  url.access-deny = ("")
+}
+
 #
 # Limit connections to 20 per IP address
 #
@@ -61,6 +69,7 @@ mimetype.assign = (
   ".css" => "text/css",
   ".gif" => "image/gif",
   ".html" => "text/html; charset=utf-8",
+  ".jpg" => "image/jpeg",
   ".js" => "application/x-javascript",
   ".png" => "image/png",
   ".swf" => "application/x-shockwave-flash",
@@ -151,8 +160,11 @@ else $HTTP["url"] =~ "^/api/0\.6/" {
 else $HTTP["url"] =~ "^/api/0\.[0-9]+/" {
   url.access-deny = ("")
 }
-else $HTTP["url"] =~ "^/geocoder/" {
-  server.error-handler-404 = "/dispatch.geocoder"
+else $HTTP["url"] =~ "^/geocoder/(search|description)_osm_namefinder$" {
+  server.error-handler-404 = "/dispatch.namefinder"
+}
+else $HTTP["url"] =~ "^/geocoder/(search|description)_geonames$" {
+  server.error-handler-404 = "/dispatch.geonames"
 }
 else $HTTP["url"] =~ "^/" {
   server.error-handler-404 = "/dispatch.web"
@@ -190,12 +202,18 @@ fastcgi.server = (
     ( "host" => "127.0.0.1", "port" => 8024, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8025, "check-local" => "disable" )
   ),
-  ".geocoder" => (
+  ".namefinder" => (
     ( "host" => "127.0.0.1", "port" => 8026, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8027, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8028, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8029, "check-local" => "disable" )
   ),
+  ".geonames" => (
+    ( "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" )
+  ),
   ".api" => (
     ( "host" => "127.0.0.1", "port" => 8030, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8031, "check-local" => "disable" ),