X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=etc%2Flighttpd%2Fvhosts%2Fstderr-nl;h=5ece6d92acba79350a3a43270059497c0a8603d2;hb=8f785b5e26be300f48203d9e7d8ea66dace8dc9e;hp=33fa8553f6a46615193b69c7da2a3aac4deec119;hpb=1ebb6abc1a88846af356f7450e102c541af572fd;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/lighttpd/vhosts/stderr-nl b/etc/lighttpd/vhosts/stderr-nl
index 33fa855..5ece6d9 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" )
@@ -23,21 +16,30 @@ $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$" {
-		alias.url += ("/ldap" => "/usr/share/phpldapadmin/htdocs")
+		alias.url += ("/ldap" => "/usr/share/phpldapadmin-patched/htdocs")
 	}
 
 	$HTTP["host"] =~ "^www.stderr.nl$" {
@@ -51,5 +53,24 @@ $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",
+		#	))
+		#)
 	}
+
+	# 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",
+		))
+	)
 }