X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6a96c72e81cc15a65c4c3960d28257fd44bc17c7..22d6633114d02af0e543afbb23cc05e33d1a1c9d:/config/lighttpd.conf?ds=sidebyside diff --git a/config/lighttpd.conf b/config/lighttpd.conf index 4735003d7..e728c6716 100644 --- a/config/lighttpd.conf +++ b/config/lighttpd.conf @@ -26,33 +26,47 @@ server.reject-expect-100-with-417 = "disable" # Setup logging # accesslog.filename = "/var/log/lighttpd/access.log" +accesslog.format = "%h %V %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%{Accept-Language}i\"" 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" } # -# IP blocked at SteveC's request as it was trying to download the -# history of every object in the database one at a time +# Pull in host blocks # -$HTTP["remoteip"] == "143.210.16.160" { url.access-deny = ("") } +include_shell "lighttpd-host-blocks.sh" # -# Rule to block tilesAtHome when somebody decides to queue vast -# number of tiles for rerendering +# Block some troublesome robots # -#$HTTP["useragent"] == "tilesAtHome" { 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 = ("") } # -# Limit connections to 20 per IP address +# Block tilesAtHome # -evasive.max-conns-per-ip = 20 +$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 = ("") +} # # Setup MIME type mapping @@ -61,6 +75,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", @@ -136,13 +151,16 @@ server.document-root = "/home/rails/public" # # Send everything else to the appropriate FastCGI server # -$HTTP["useragent"] =~ "^tilesAtHome" { - server.error-handler-404 = "/dispatch.tah" +$HTTP["url"] =~ "^/trace/[0-9]+/data$" { + server.error-handler-404 = "/dispatch.bulkapi" +} +else $HTTP["url"] =~ "^/api/0\.6/map$" { + server.error-handler-404 = "/dispatch.map" } -else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints|changeset/[0-9]+/upload)$" { +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|search)$" { +else $HTTP["url"] =~ "^/api/0\.6/.*/(full|history|search|ways)$" { server.error-handler-404 = "/dispatch.bulkapi" } else $HTTP["url"] =~ "^/api/0\.6/" { @@ -151,8 +169,8 @@ 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)_geonames$" { + server.error-handler-404 = "/dispatch.geonames" } else $HTTP["url"] =~ "^/" { server.error-handler-404 = "/dispatch.web" @@ -188,19 +206,19 @@ 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" ) - ), - ".geocoder" => ( + ( "host" => "127.0.0.1", "port" => 8025, "check-local" => "disable" ), ( "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" ) ), - ".api" => ( + ".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" ), + ( "host" => "127.0.0.1", "port" => 8033, "check-local" => "disable" ) + ), + ".api" => ( ( "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" ), @@ -211,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" ), @@ -247,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" ) ) )