X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/62847c92f5b2b7b8a2a7dcee21866287246e65cb..6ae593fe7768d6f731a83486ec812bc2d23d33f7:/config/lighttpd.conf?ds=inline diff --git a/config/lighttpd.conf b/config/lighttpd.conf index b5d87f1cb..c1537edef 100644 --- a/config/lighttpd.conf +++ b/config/lighttpd.conf @@ -19,6 +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 @@ -29,14 +31,11 @@ server.errorlog = "/var/log/lighttpd/error.log" # # Allow munin to monitor the server's status # -$HTTP["remoteip"] == "127.0.0.1" { status.status-url = "/server-status" } - -# -# Fail any attempt to access old versions of the API without -# getting rails involved at all -# -$HTTP["url"] =~ "^/api/0.3/" { url.access-deny = ("") } -$HTTP["url"] =~ "^/api/0.4/" { url.access-deny = ("") } +$HTTP["remoteip"] == "127.0.0.1" { + 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 @@ -61,7 +60,7 @@ evasive.max-conns-per-ip = 20 mimetype.assign = ( ".css" => "text/css", ".gif" => "image/gif", - ".html" => "text/html", + ".html" => "text/html; charset=utf-8", ".js" => "application/x-javascript", ".png" => "image/png", ".swf" => "application/x-shockwave-flash", @@ -91,7 +90,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", @@ -111,6 +110,19 @@ url.redirect = ( "^/wiki/(.*)$" => "http://wiki.openstreetmap.org/$1" ) +# +# Redirect everything except www.openstreetmap.org and +# api.openstreetmap.org to www.openstreetmap.org +# +$HTTP["host"] =~ "^api\." { + $HTTP["host"] != "api.openstreetmap.org" { + url.redirect = ( "^(.*)$" => "http://api.openstreetmap.org$1" ) + } +} +else $HTTP["host"] != "www.openstreetmap.org" { + url.redirect = ( "^(.*)$" => "http://www.openstreetmap.org$1" ) +} + # # Run anything with a .pl iextension as a CGI script # @@ -119,7 +131,7 @@ cgi.assign = ( ".pl" => "/usr/bin/perl" ) # # Serve static content from the rails public area ourselves # -server.document-root = "/var/www/rails/public" +server.document-root = "/home/rails/public" # # Send everything else to the appropriate FastCGI server @@ -127,13 +139,13 @@ server.document-root = "/var/www/rails/public" $HTTP["useragent"] == "tilesAtHome" { server.error-handler-404 = "/dispatch.tah" } -else $HTTP["url"] =~ "^/api/0\.5/(map|trackpoints|amf|swf/trackpoints)$" { +else $HTTP["url"] =~ "^/api/0\.6/(map|trackpoints|amf|amf/read|swf/trackpoints)$" { server.error-handler-404 = "/dispatch.bulkapi" } -else $HTTP["url"] =~ "^/api/0\.5/.*/search$" { +else $HTTP["url"] =~ "^/api/0\.6/.*/search$" { server.error-handler-404 = "/dispatch.bulkapi" } -else $HTTP["url"] =~ "^/api/0\.5/" { +else $HTTP["url"] =~ "^/api/0\.6/" { server.error-handler-404 = "/dispatch.api" } else $HTTP["url"] =~ "^/api/0\.[0-9]+/" { @@ -147,17 +159,75 @@ else $HTTP["url"] =~ "^/" { # Configure the FastCGI servers # fastcgi.server = ( - ".fcgi" => ( + ".web" => ( ( "host" => "127.0.0.1", "port" => 8000, "check-local" => "disable" ), ( "host" => "127.0.0.1", "port" => 8001, "check-local" => "disable" ), ( "host" => "127.0.0.1", "port" => 8002, "check-local" => "disable" ), ( "host" => "127.0.0.1", "port" => 8003, "check-local" => "disable" ), ( "host" => "127.0.0.1", "port" => 8004, "check-local" => "disable" ), - ( "host" => "127.0.0.1", "port" => 8005, "check-local" => "disable" ) - ), - ".api" => ( + ( "host" => "127.0.0.1", "port" => 8005, "check-local" => "disable" ), ( "host" => "127.0.0.1", "port" => 8006, "check-local" => "disable" ), ( "host" => "127.0.0.1", "port" => 8007, "check-local" => "disable" ), - ( "host" => "127.0.0.1", "port" => 8008, "check-local" => "disable" ) + ( "host" => "127.0.0.1", "port" => 8008, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8009, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8010, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8011, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8012, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8013, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8014, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8015, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8016, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8017, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8018, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8019, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8020, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8021, "check-local" => "disable" ), + ( "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" => 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" => ( + ( "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" ), + ( "host" => "127.0.0.1", "port" => 8037, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8038, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8039, "check-local" => "disable" ), + ( "host" => "127.0.0.1", "port" => 8040, "check-local" => "disable" ), + ( "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" ) + ), + ".bulkapi" => ( + ( "host" => "10.0.0.10", "port" => 8000, "check-local" => "disable" ), + ( "host" => "10.0.0.11", "port" => 8000, "check-local" => "disable" ), + ( "host" => "10.0.0.12", "port" => 8000, "check-local" => "disable" ), + ( "host" => "10.0.0.10", "port" => 8001, "check-local" => "disable" ), + ( "host" => "10.0.0.11", "port" => 8001, "check-local" => "disable" ), + ( "host" => "10.0.0.12", "port" => 8001, "check-local" => "disable" ), + ( "host" => "10.0.0.10", "port" => 8002, "check-local" => "disable" ), + ( "host" => "10.0.0.11", "port" => 8002, "check-local" => "disable" ), + ( "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.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" ) ) )