lighttpd: Only catch /trac/ urls with trac.

[matthijs/servers/drsnuggles.git] / etc / lighttpd / vhosts / stderr-nl

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index 2012e8b129e09195f24849cb46c26f325d14cfdd..addedc81b7468461990698f1cd4e817563889f7d 100644 (file)
--- a/etc/lighttpd/vhosts/stderr-nl
+++ b/etc/lighttpd/vhosts/stderr-nl
@@ -5,15 +5,8 @@ $HTTP["host"] =~ ".stderr.nl$" {
        evhost.path-pattern  = var.site-dir + "/htdocs/%3/"
        accesslog.filename   = var.site-dir + "/logs/access.log"
 
-       fastcgi.server    = ( 
-               ".php" => 
-               ((
-                       "socket" => var.site-fcgi-dir + "/php",
-                       "broken-scriptfilename" => "enable",
-               ))
-       )
-
        $HTTP["host"] =~ "git.stderr.nl$" {
+               cgi.assign += ( "gitweb.cgi" => "" )
                # Put this alias in a url conditional, so urls like /gitweb.css won't get alias'd
                $HTTP["url"] =~ "^/gitweb(/.*)?$" {
                        alias.url += ( "/gitweb" => "/usr/lib/cgi-bin/gitweb.cgi" )
@@ -36,13 +29,15 @@ $HTTP["host"] =~ ".stderr.nl$" {
                )
                # Only publish the pandora trac repos here
                url.redirect += ("^/trac/?$" => "/trac/pandora")
-               fastcgi.server    += ( 
-                       "/trac" => 
-                       ((
-                               "socket" => var.site-fcgi-dir + "/trac",
-                               "check-local" => "disable",
-                       ))
-               )
+               $HTTP["url"] =~ "^/trac/.*" {
+                       fastcgi.server    += ( 
+                               "/trac" => 
+                               ((
+                                       "socket" => var.site-fcgi-dir + "/trac",
+                                       "check-local" => "disable",
+                               ))
+                       )
+               }
        }
 
        $HTTP["host"] =~ "^drsnuggles.stderr.nl$" {
@@ -69,4 +64,15 @@ $HTTP["host"] =~ ".stderr.nl$" {
                #       ))
                #)
        }
+
+       # Put the php fastcgi server last, so it won't trigger on any urls that
+       # should be handled by other fastcgi servers (for example, viewing a
+       # .php file in trac results in an url /trac/.../foo.php).
+       fastcgi.server    += ( 
+               ".php" => 
+               ((
+                       "socket" => var.site-fcgi-dir + "/php",
+                       "broken-scriptfilename" => "enable",
+               ))
+       )
 }