Merge commit 'origin/template' into www

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

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index 22410ffe7d171a64c5e2f5f716b45a380bf95b98..f332a7190eeab7d10e6df6483b5f9e82791d95ac 100644 (file)
--- a/etc/lighttpd/vhosts/stderr-nl
+++ b/etc/lighttpd/vhosts/stderr-nl
@@ -14,6 +14,7 @@ $HTTP["host"] =~ ".stderr.nl$" {
        )
 
        $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" )
@@ -23,17 +24,26 @@ $HTTP["host"] =~ ".stderr.nl$" {
                }
        }
 
-       $HTTP["host"] =~ "indigetes.stderr.nl$" {
+       $HTTP["host"] =~ "blues.stderr.nl$" {
                auth.backend                   = "htpasswd"
-               auth.backend.htpasswd.userfile = var.site-dir + "/pandora2008.user"
+               auth.backend.htpasswd.userfile = var.site-dir + "/conf/pandora2009.user"
 
                auth.require = ( 
                        "/" => (
                                "method"  => "basic",
-                               "realm"   => "Di Indigetes",
+                               "realm"   => "Blues Brothers",
                                "require" => "valid-user"
                        )
                )
+               # 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["host"] =~ "^drsnuggles.stderr.nl$" {
@@ -51,5 +61,13 @@ $HTTP["host"] =~ ".stderr.nl$" {
                                "BLOSXOM_HTDOCS_URL" =>  "/blog/",
                        )
                }
+               # Disabled for now, since the only working trac is the pandora trac
+               #fastcgi.server    += ( 
+               #       "/trac" => 
+               #       ((
+               #               "socket" => var.site-fcgi-dir + "/trac",
+               #               "check-local" => "disable",
+               #       ))
+               #)
        }
 }