X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fstderr-nl;h=fd12de44c5401f904dd9b2315c236b9bfdf1151e;hb=10d2b563454e14f6d7e2e56d9656f4b3c6ebf33a;hp=f332a7190eeab7d10e6df6483b5f9e82791d95ac;hpb=202368ea600f1c63978b6e130adb9e47d3d752d3;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index f332a71..fd12de4 100644
--- a/etc/lighttpd/vhosts/stderr-nl
+++ b/etc/lighttpd/vhosts/stderr-nl
@@ -3,15 +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"
-
-	fastcgi.server    = ( 
-		".php" => 
-		((
-			"socket" => var.site-fcgi-dir + "/php",
-			"broken-scriptfilename" => "enable",
-		))
-	)
 
 	$HTTP["host"] =~ "git.stderr.nl$" {
 		cgi.assign += ( "gitweb.cgi" => "" )
@@ -22,11 +13,36 @@ $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["querystring"] =~ "/brevidius/" {
+		    auth.backend = "htpasswd"
+		    auth.backend.htpasswd.userfile = var.site-dir + "/conf/brevidius.user"
+		    auth.require = (
+			    "/" => (
+				    "method"  => "basic",
+				    "realm"   => "Brevidius",
+				    "require" => "valid-user"
+			    )
+		    )
+		}
+	}
+
+	$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$" {
 		auth.backend                   = "htpasswd"
 		auth.backend.htpasswd.userfile = var.site-dir + "/conf/pandora2009.user"
+		dir-listing.activate = "enable"
 
 		auth.require = ( 
 			"/" => (
@@ -37,28 +53,34 @@ $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$" {
-		alias.url += ("/ldap" => "/usr/share/phpldapadmin-patched/htdocs")
+		alias.url += ("/ldap" => "/usr/share/phpldapadmin/htdocs")
 	}
 
 	$HTTP["host"] =~ "^www.stderr.nl$" {
-		$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
@@ -70,4 +92,20 @@ $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",
+		))
+	)
+
+	$HTTP["url"] =~ "^/static/tmp/" {
+		# Enable dirlistings for /tmp
+		server.dir-listing = "enable"
+	}
 }