Merge commit 'git-svn'

[rails.git] / config / lighttpd.conf

diff --git a/config/lighttpd.conf b/config/lighttpd.conf
index ffe2ea4f3adb364752b2201e6246794826bb0744..317413f573a7ea2db689a89196284408b0c28ca7 100644 (file)
--- a/config/lighttpd.conf
+++ b/config/lighttpd.conf
@@ -4,9 +4,11 @@
 server.modules = ( 
   "mod_access",
   "mod_accesslog",
+  "mod_cgi",
   "mod_compress",
   "mod_evasive",
   "mod_fastcgi",
+  "mod_redirect",
   "mod_status"
 )
 
@@ -40,6 +42,12 @@ $HTTP["url"] =~ "^/api/0.3/" { url.access-deny = ("") }
 #
 $HTTP["remoteip"] == "143.210.16.160" { url.access-deny = ("") }
 
+#
+# Rule to block tilesAtHome when somebody decides to queue vast 
+# number of tiles for rerendering
+#
+#$HTTP["useragent"] == "tilesAtHome" { url.access-deny = ("") }
+
 #
 # Limit connections to 20 per IP address
 #
@@ -74,6 +82,19 @@ compress.filetype = (
 #
 compress.cache-dir = "/var/cache/lighttpd"
 
+#
+# 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
+#
+cgi.assign = ( ".pl" => "/usr/bin/perl" )
+
 #
 # Serve static content from the rails public area ourselves
 #