X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fstderr-nl;h=1b55f09546710d7ae7e45411e9203a99d669d025;hb=841f77ed1a854d8e5daa9083530feaa2684bfe12;hp=edab22b99d32dabc200c26f26b648721d34eb097;hpb=31c2947a596fff71cc735cec329f27ba2d67b4be;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index edab22b..1b55f09 100644
--- a/etc/lighttpd/vhosts/stderr-nl
+++ b/etc/lighttpd/vhosts/stderr-nl
@@ -3,7 +3,6 @@ $HTTP["host"] =~ ".stderr.nl$" {
 	var.site-fcgi-dir    = var.fcgi-dir + "/stderr-nl"
 
 	evhost.path-pattern  = var.site-dir + "/htdocs/%3/"
-	accesslog.filename   = var.site-dir + "/logs/access.log"
 
 	$HTTP["host"] =~ "git.stderr.nl$" {
 		cgi.assign += ( "gitweb.cgi" => "" )
@@ -14,6 +13,19 @@ $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")
+		# Redirect / to gitweb
+		url.redirect += ("^/$" => "/gitweb")
+	}
+
+	$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,21 +54,22 @@ $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$" {
-		$HTTP["url"] !~ "^/(blosxom|blog)" {
-			url.redirect += ("^(.*)$" => "http://katherina.student.utwente.nl/~matthijs/cgi-bin/blosxom$1")
-		}
-		$HTTP["url"] =~ "^/blosxom" {
+		url.redirect += ("^/$" => "/Blog/")
+		# Category got renamed
+		url.redirect += ("^/Blog/personal(.*)" => "/Blog/Personal$1")
+		$HTTP["url"] !~ "^/(Old blog|static|stats)" {
 			cgi.assign += ( "blosxom.cgi" => "/usr/local/bin/aclperl" )
-			alias.url += ( "/blosxom" => 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_HTDOCS_URL" =>  "/blog/",
+				"BLOSXOM_LOGS_BASE" => var.site-dir + "/logs",
+				"BLOSXOM_HTDOCS_URL" =>  "/static/",
 			)
 		}
 		# Disabled for now, since the only working trac is the pandora trac