X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fstderr-nl;h=0d6b94b8d4ab8dd43803b2228a77aa1e8461a2d6;hb=887963279cdd00f8302b480f2e542ee42c65f72e;hp=2012e8b129e09195f24849cb46c26f325d14cfdd;hpb=6553ae6d6ff03ed0b7ac4d3c9144371fe0a7616a;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index 2012e8b..0d6b94b 100644
--- 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" )
@@ -26,6 +19,7 @@ $HTTP["host"] =~ ".stderr.nl$" {
 	$HTTP["host"] =~ "blues.stderr.nl$" {
 		auth.backend                   = "htpasswd"
 		auth.backend.htpasswd.userfile = var.site-dir + "/conf/pandora2009.user"
+		dir-listing.activate = "enable"
 
 		auth.require = ( 
 			"/" => (
@@ -36,13 +30,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$" {
@@ -50,14 +46,17 @@ $HTTP["host"] =~ ".stderr.nl$" {
 	}
 
 	$HTTP["host"] =~ "^www.stderr.nl$" {
-		$HTTP["url"] =~ "^/blosxom" {
+		url.redirect += ("^/$" => "/Blog/")
+		# Category got renamed
+		url.redirect += ("^/Blog/personal(.*)" => "/Blog/Personal$1")
+		$HTTP["url"] =~ "^/Blog" {
 			cgi.assign += ( "blosxom.cgi" => "/usr/local/bin/aclperl" )
-			alias.url += ( "/blosxom" => var.site-dir + "/applications/blosxom/blosxom.cgi" )
+			alias.url += ( "/Blog" => 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_HTDOCS_URL" =>  "/static/",
 			)
 		}
 		# Disabled for now, since the only working trac is the pandora trac
@@ -69,4 +68,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",
+		))
+	)
 }