Amend License signup text to be simpler to understand.

[rails.git] / config / lighttpd.conf

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 22051eb44657c667356d8f50b5e93a4b319407a3..c1537edef3d9be1e264636f9a500ca88448d1749 100644 (file)
--- 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.username = "www-data"
 server.groupname = "www-data"
 server.pid-file = "/var/run/lighttpd.pid"

-

 server.max-fds = 8192
 server.max-fds = 8192

+server.reject-expect-100-with-417 = "disable"

 
 #
 # Setup logging
 
 #
 # Setup logging


@@ -90,7 +90,7 @@ compress.filetype = (
 # Set expiry for static content
 #
 expire.url = (
 # 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",
   "/images/" => "access 10 years",
   "/javascripts/" => "access 10 years",
   "/openlayers/" => "access 7 days",


@@ -110,6 +110,19 @@ url.redirect = (
   "^/wiki/(.*)$" => "http://wiki.openstreetmap.org/$1"
 )
 
   "^/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
 #
 #
 # Run anything with a .pl iextension as a CGI script
 #