api06: Move version-checking into the models, raising an exception on mismatch

[rails.git] / config / lighttpd.conf

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index 9e859b2e0a79bb8314a20c14dd811adc089bb55e..74aa6f38f3628f16dfdd7eb64154df738ba8282a 100644 (file)
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -4,8 +4,10 @@
 server.modules = ( 
   "mod_access",
   "mod_accesslog",
 server.modules = ( 
   "mod_access",
   "mod_accesslog",

+  "mod_cgi",

   "mod_compress",
   "mod_evasive",
   "mod_compress",
   "mod_evasive",

+  "mod_expire",

   "mod_fastcgi",
   "mod_redirect",
   "mod_status"
   "mod_fastcgi",
   "mod_redirect",
   "mod_status"


@@ -30,10 +32,11 @@ server.errorlog = "/var/log/lighttpd/error.log"
 $HTTP["remoteip"] == "127.0.0.1" { status.status-url = "/server-status" }
 
 #
 $HTTP["remoteip"] == "127.0.0.1" { status.status-url = "/server-status" }
 
 #

-# API 0.3 is long dead, so fail any attempt to access it without
+# Fail any attempt to access old versions of the API without

 # getting rails involved at all
 #
 $HTTP["url"] =~ "^/api/0.3/" { url.access-deny = ("") }
 # getting rails involved at all
 #
 $HTTP["url"] =~ "^/api/0.3/" { url.access-deny = ("") }

+$HTTP["url"] =~ "^/api/0.4/" { url.access-deny = ("") }

 
 #
 # IP blocked at SteveC's request as it was trying to download the
 
 #
 # IP blocked at SteveC's request as it was trying to download the


@@ -76,15 +79,34 @@ compress.filetype = (
   "text/plain"
 )
 
   "text/plain"
 )
 

+#
+# Set expiry for static content
+#
+expire.url = (
+  "/export/" => "access 7 days",
+  "/images/" => "access 10 years",
+  "/javascripts/" => "access 10 years",
+  "/openlayers/" => "access 7 days",
+  "/stylesheets/" => "access 10 years"
+)
+

 #
 # Cache compressed content
 #
 compress.cache-dir = "/var/cache/lighttpd"
 
 #
 #
 # Cache compressed content
 #
 compress.cache-dir = "/var/cache/lighttpd"
 
 #

-# Redirect wiki requests to the wiki
+# Redirect trac and wiki requests to the right places
+#
+url.redirect = ( 
+  "^/trac/(.*)$" => "http://trac.openstreetmap.org/$1",
+  "^/wiki/(.*)$" => "http://wiki.openstreetmap.org/$1"
+)
+
+#
+# Run anything with a .pl iextension as a CGI script

 #
 #

-url.redirect = ( "^/wiki/(.*)$" => "http://wiki.openstreetmap.org/wiki/$1" )
+cgi.assign = ( ".pl" => "/usr/bin/perl" )

 
 #
 # Serve static content from the rails public area ourselves
 
 #
 # Serve static content from the rails public area ourselves