lighttpd: Point /phpldapadmin to the non-patched version again.

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

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index b65c8e35a4047d53a20b1607b1eb00eec0a16f0d..0d6314b4eeec3d59e349e51f0d0fb876c76ba45f 100644 (file)
--- a/etc/lighttpd/vhosts/stderr-nl
+++ b/etc/lighttpd/vhosts/stderr-nl
@@ -14,6 +14,17 @@ $HTTP["host"] =~ ".stderr.nl$" {
                $HTTP["url"] =~ ".git/" {
                        alias.url += ( "/" => "/data/vcs/git/" )
                }
+               # Redirect this url, which was published in my Master's
+               # thesis. Use .* instead of λ, since mod_redirect doesn't like
+               # the λ for some reason.
+               url.redirect += ("^/gitweb\?p=matthijs/projects/c.*ash\.git" => "/gitweb?p=matthijs/master-project/cλash.git")
+       }
+
+       $HTTP["host"] =~ "hg.stderr.nl$" {
+               # Let all of hg.stderr.nl be handled by hgweb, since it also
+               # takes care of clone / pull requests.
+               cgi.assign += ( "hgwebdir.cgi" => "" )
+               alias.url += ( "" => "/usr/local/lib/cgi-bin/hgwebdir.cgi" )
        }
 
        $HTTP["host"] =~ "blues.stderr.nl$" {
@@ -42,18 +53,21 @@ $HTTP["host"] =~ ".stderr.nl$" {
        }
 
        $HTTP["host"] =~ "^drsnuggles.stderr.nl$" {
-               alias.url += ("/ldap" => "/usr/share/phpldapadmin-patched/htdocs")
+               alias.url += ("/ldap" => "/usr/share/phpldapadmin/htdocs")
        }
 
        $HTTP["host"] =~ "^www.stderr.nl$" {
                url.redirect += ("^/$" => "/Blog/")
-               $HTTP["url"] =~ "^/Blog" {
+               # Category got renamed
+               url.redirect += ("^/Blog/personal(.*)" => "/Blog/Personal$1")
+               $HTTP["url"] !~ "^/(Old blog|static)" {
                        cgi.assign += ( "blosxom.cgi" => "/usr/local/bin/aclperl" )
-                       alias.url += ( "/Blog" => var.site-dir + "/applications/blosxom/blosxom.cgi" )
+                       alias.url += ( "" => var.site-dir + "/applications/blosxom/blosxom.cgi" )
                        setenv.add-environment += (
                                "BLOSXOM_CONFIG_FILE" => var.site-dir + "/conf/blosxom.conf",
                                "BLOSXOM_DATA_BASE" => var.site-dir + "/data/blosxom",
                                "BLOSXOM_CODE_BASE" => var.site-dir + "/applications/blosxom",
+                               "BLOSXOM_LOGS_BASE" => var.site-dir + "/logs",
                                "BLOSXOM_HTDOCS_URL" =>  "/static/",
                        )
                }