X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf8ac762ddd9c80d461d7226c60f79fd2c40c1d7..be624d64f395c40a78249754825cecdd9b050398:/config/lighttpd.conf?ds=inline diff --git a/config/lighttpd.conf b/config/lighttpd.conf index 15b31ca4d..e728c6716 100644 --- a/config/lighttpd.conf +++ b/config/lighttpd.conf @@ -46,16 +46,19 @@ include_shell "lighttpd-host-blocks.sh" # # Block some troublesome robots # -$HTTP["useragent"] =~ "msnbot" { url.access-deny = ("") } +#$HTTP["useragent"] =~ "msnbot" { url.access-deny = ("") } $HTTP["useragent"] =~ "Twiceler" { url.access-deny = ("") } $HTTP["useragent"] =~ "Baiduspider" { url.access-deny = ("") } $HTTP["useragent"] =~ "Sosospider+" { url.access-deny = ("") } +#$HTTP["useragent"] =~ "Yahoo! Slurp" { url.access-deny = ("") } +$HTTP["useragent"] =~ "Yeti" { url.access-deny = ("") } +#$HTTP["useragent"] =~ "Googlebot" { url.access-deny = ("") } +$HTTP["useragent"] =~ "The Hare and the Hedgeho" { url.access-deny = ("") } # -# Rule to block tilesAtHome when somebody decides to queue vast -# number of tiles for rerendering +# Block tilesAtHome # -#$HTTP["useragent"] == "tilesAtHome" { url.access-deny = ("") } +$HTTP["useragent"] =~ "tilesAtHome" { url.access-deny = ("") } # # Block JOSM revisions 1722-1727 as they have a serious bug that causes @@ -148,13 +151,13 @@ server.document-root = "/home/rails/public" # # Send everything else to the appropriate FastCGI server # -$HTTP["useragent"] =~ "^tilesAtHome" { - server.error-handler-404 = "/dispatch.tah" -} -else $HTTP["url"] =~ "^/trace/[0-9]+/data$" { +$HTTP["url"] =~ "^/trace/[0-9]+/data$" { server.error-handler-404 = "/dispatch.bulkapi" } -else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints|changeset/[0-9]+/(upload|download))$" { +else $HTTP["url"] =~ "^/api/0\.6/map$" { + server.error-handler-404 = "/dispatch.map" +} +else $HTTP["url"] =~ "^/api/0\.6/(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)$" { @@ -266,10 +269,13 @@ fastcgi.server = ( ( "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" ) + ), + ".map" => ( + ( "host" => "10.0.0.10", "port" => 9000, "check-local" => "disable" ), + ( "host" => "10.0.0.11", "port" => 9000, "check-local" => "disable" ), + ( "host" => "10.0.0.12", "port" => 9000, "check-local" => "disable" ) ) )