X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fevolution-events-nl;h=a24a31ce7c7443937b51fc16ccda7a8c976dd6ca;hb=e3a83cd73d36177c783c51c5bde37e45441b7459;hp=ca5e1bf55e79175045896e6836831c6e87a96b2a;hpb=8cbae7c2c9aa2d4ed4371113e5900a9adbfa6d5e;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/lighttpd/vhosts/evolution-events-nl b/etc/lighttpd/vhosts/evolution-events-nl
index ca5e1bf..a24a31c 100644
--- a/etc/lighttpd/vhosts/evolution-events-nl
+++ b/etc/lighttpd/vhosts/evolution-events-nl
@@ -7,9 +7,13 @@ $HTTP["host"] =~ ".evolution-events.nl$" {
 	var.site-fcgi-dir    = var.fcgi-dir + "/evolution-events-nl"
 
 	evhost.path-pattern  = var.site-dir + "/htdocs/%3/"
-	accesslog.filename   = var.site-dir + "/logs/access.log"
+
+	# Configure a simple plaintext password file
+	auth.backend                 = "plain"
+	auth.backend.plain.userfile  = var.site-dir + "/conf/simple.user"
+
 	
-	fastcgi.server = ( 
+	fastcgi.server += ( 
 		".php" => 
 		((
 			"socket" => var.site-fcgi-dir + "/php",
@@ -19,56 +23,93 @@ $HTTP["host"] =~ ".evolution-events.nl$" {
 		((
 			"socket" => var.site-fcgi-dir + "/wipi",
 			"check-local" => "disable",
-			"broken-scriptfilename" => "enable",
 		)),
 	)
-	alias.url = (
+	alias.url += (
 		# Don't name this /wipistatic, since that will be caught by fastcgi above
 		"/staticwipi" => var.site-dir + "/applications/wipi/static/",
 	)
 	
-	url.rewrite-once = (
+	url.rewrite-once += (
 		"^/wipi/static/(.*)$" => "/staticwipi/$1",
-		"^(/.*)$" => "$1",
+		"^/Site(/.*|\?.*|)$" => "/wipi/Site/$1",
 	)
 
 	$HTTP["host"] =~ "^orga.evolution-events.nl$" {
-		auth.backend                 = "plain"
-		auth.backend.plain.userfile  = var.site-dir + "/conf/simple.user"
 
-		auth.require 	= ( "/private" => 
+		auth.require 	+= ( "/private" => 
 			( 
 				"method"  => "digest",
 				"realm"   => "Evolution Events",
 				"require" => "user=admin"
 			)
 		)
-		
+		$HTTP["url"] =~ "^/private/" {
+		    # Enable dirlistings for /private
+		    server.dir-listing = "enable"
+		}
 
-		url.rewrite-once = (
+		url.rewrite-once += (
 			"^/forum/(.+)$" => "/forum/",
 		)
 	}
 
-	$HTTP["host"] =~ "^xerxes.evolution-events.nl$" {
-		fastcgi.server  = ( 
+	$HTTP["host"] =~ "^hunter-net.evolution-events.nl$" {
+		fastcgi.server  += ( 
 			"/blaa" =>
 			((
-				"socket" => var.site-fcgi-dir + "/xerxes",
+				"socket" => var.site-fcgi-dir + "/hunternet",
 				"check-local" => "disable",
 			)),
 		)
 
-		alias.url = (
-			"/media/" => "/home/matthijs/django/contrib/admin/media/",
-			"/static/" => var.site-dir + "/applications/xerxes/static/",
+		alias.url += (
+			"/media/" => "/usr/share/python-support/python-django/django/contrib/admin/media/",
+			"/static/" => var.site-dir + "/applications/xerxes/media/",
 		)
 
-		url.rewrite-once = (
+		url.rewrite-once += (
+#			"^(/.*)$" => "/",
 			"^(/media.*)$" => "$1",
 			"^(/static.*)$" => "$1",
 			"^/favicon\.ico$" => "/media/favicon.ico",
 			"^(/.*)$" => "/blaa$1",
 		)
 	}
+
+	$HTTP["host"] =~ "^xerxes.evolution-events.nl$" {
+		fastcgi.server  += ( 
+			"/blaa" =>
+			((
+				"socket" => var.site-fcgi-dir + "/xerxes",
+				"check-local" => "disable",
+			)),
+		)
+
+		alias.url += (
+			"/admin/media/" => "/usr/share/python-support/python-django/django/contrib/admin/media/",
+			"/media/" => var.site-dir + "/applications/xerxes/media/",
+		)
+
+		url.rewrite-once += (
+			"^(/media.*)$" => "$1",
+			"^(/admin/media.*)$" => "$1",
+			#"^/favicon\.ico$" => "/admin/media/favicon.ico",
+			"^(/.*)$" => "/blaa$1",
+		)
+	}
+	
+	# Redirect some deprecated urls.
+	$HTTP["host"] =~ "^lextalionis2.evolution-events.nl$" {
+		url.redirect = ( "^(.*)$" => "http://lextalionis.evolution-events.nl$1" )
+	}
+	$HTTP["host"] =~ "^raganorck2.evolution-events.nl$" {
+		url.redirect = ( "^(.*)$" => "http://raganorck.evolution-events.nl$1" )
+	}
+	$HTTP["host"] =~ "^exodus2.evolution-events.nl$" {
+		url.redirect = ( "^(.*)$" => "http://exodus.evolution-events.nl$1" )
+	}
+	$HTTP["host"] =~ "^www2.evolution-events.nl$" {
+		url.redirect = ( "^(.*)$" => "http://www.evolution-events.nl$1" )
+	}
 }