X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ddde8689a601615b016a79b86a651ee668b1e601..495b8e2cb62d6479c4e246677f236e1fee69b61c:/config/lighttpd.conf

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 80b941fa6..3befa5c87 100644
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -19,8 +19,8 @@ server.modules = (
 server.username = "www-data"
 server.groupname = "www-data"
 server.pid-file = "/var/run/lighttpd.pid"
-
 server.max-fds = 8192
+server.reject-expect-100-with-417 = "disable"
 
 #
 # Setup logging
@@ -31,7 +31,7 @@ server.errorlog = "/var/log/lighttpd/error.log"
 #
 # Allow munin to monitor the server's status
 #
-$HTTP["remoteip"] == "127.0.0.1" { 
+$HTTP["remoteip"] == "128.40.168.98" { 
   status.config-url = "/server-config"
   status.status-url = "/server-status"
   status.statistics-url = "/server-statistics"
@@ -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",
@@ -90,7 +99,7 @@ compress.filetype = (
 # Set expiry for static content
 #
 expire.url = (
-  "/export/" => "access 7 days",
+  "/export/embed.html" => "access 7 days",
   "/images/" => "access 10 years",
   "/javascripts/" => "access 10 years",
   "/openlayers/" => "access 7 days",
@@ -136,13 +145,13 @@ server.document-root = "/home/rails/public"
 #
 # Send everything else to the appropriate FastCGI server
 #
-$HTTP["useragent"] == "tilesAtHome" {
+$HTTP["useragent"] =~ "^tilesAtHome" {
   server.error-handler-404 = "/dispatch.tah"
 }
-else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints)$" {
+else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints|changeset/[0-9]+/upload)$" {
   server.error-handler-404 = "/dispatch.bulkapi"
 }
-else $HTTP["url"] =~ "^/api/0\.6/.*/search$" {
+else $HTTP["url"] =~ "^/api/0\.6/.*/(full|search)$" {
   server.error-handler-404 = "/dispatch.bulkapi"
 }
 else $HTTP["url"] =~ "^/api/0\.6/" {
@@ -151,6 +160,12 @@ else $HTTP["url"] =~ "^/api/0\.6/" {
 else $HTTP["url"] =~ "^/api/0\.[0-9]+/" {
   url.access-deny = ("")
 }
+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"
 }
@@ -185,12 +200,20 @@ fastcgi.server = (
     ( "host" => "127.0.0.1", "port" => 8022, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8023, "check-local" => "disable" ),
     ( "host" => "127.0.0.1", "port" => 8024, "check-local" => "disable" ),
-    ( "host" => "127.0.0.1", "port" => 8025, "check-local" => "disable" ),
+    ( "host" => "127.0.0.1", "port" => 8025, "check-local" => "disable" )
+  ),
+  ".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" ),
@@ -220,14 +243,32 @@ fastcgi.server = (
     ( "host" => "10.0.0.12", "port" => 8002, "check-local" => "disable" ),
     ( "host" => "10.0.0.10", "port" => 8003, "check-local" => "disable" ),
     ( "host" => "10.0.0.11", "port" => 8003, "check-local" => "disable" ),
-    ( "host" => "10.0.0.12", "port" => 8003, "check-local" => "disable" )
-  ),
-  ".tah" => (
+    ( "host" => "10.0.0.12", "port" => 8003, "check-local" => "disable" ),
     ( "host" => "10.0.0.10", "port" => 8004, "check-local" => "disable" ),
     ( "host" => "10.0.0.11", "port" => 8004, "check-local" => "disable" ),
     ( "host" => "10.0.0.12", "port" => 8004, "check-local" => "disable" ),
     ( "host" => "10.0.0.10", "port" => 8005, "check-local" => "disable" ),
     ( "host" => "10.0.0.11", "port" => 8005, "check-local" => "disable" ),
-    ( "host" => "10.0.0.12", "port" => 8005, "check-local" => "disable" )
+    ( "host" => "10.0.0.12", "port" => 8005, "check-local" => "disable" ),
+    ( "host" => "10.0.0.10", "port" => 8006, "check-local" => "disable" ),
+    ( "host" => "10.0.0.11", "port" => 8006, "check-local" => "disable" ),
+    ( "host" => "10.0.0.12", "port" => 8006, "check-local" => "disable" ),
+    ( "host" => "10.0.0.10", "port" => 8007, "check-local" => "disable" ),
+    ( "host" => "10.0.0.11", "port" => 8007, "check-local" => "disable" ),
+    ( "host" => "10.0.0.12", "port" => 8007, "check-local" => "disable" ),
+    ( "host" => "10.0.0.10", "port" => 8008, "check-local" => "disable" ),
+    ( "host" => "10.0.0.11", "port" => 8008, "check-local" => "disable" ),
+    ( "host" => "10.0.0.12", "port" => 8008, "check-local" => "disable" ),
+    ( "host" => "10.0.0.10", "port" => 8009, "check-local" => "disable" ),
+    ( "host" => "10.0.0.11", "port" => 8009, "check-local" => "disable" ),
+    ( "host" => "10.0.0.12", "port" => 8009, "check-local" => "disable" ),
+    ( "host" => "10.0.0.10", "port" => 8010, "check-local" => "disable" ),
+    ( "host" => "10.0.0.11", "port" => 8010, "check-local" => "disable" ),
+    ( "host" => "10.0.0.12", "port" => 8010, "check-local" => "disable" ),
+  ),
+  ".tah" => (
+    ( "host" => "10.0.0.10", "port" => 8011, "check-local" => "disable" ),
+    ( "host" => "10.0.0.11", "port" => 8011, "check-local" => "disable" ),
+    ( "host" => "10.0.0.12", "port" => 8011, "check-local" => "disable" )
   )
 )