X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fevolution-events-nl;h=b20f9648da719e889f6d4287d47d670603a28217;hb=841f77ed1a854d8e5daa9083530feaa2684bfe12;hp=933cdcfcb4448a1f5ff847d6e7f5fc70910d154f;hpb=1ea96d8de7a5a4d23846043547149d89eb3261dc;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/lighttpd/vhosts/evolution-events-nl b/etc/lighttpd/vhosts/evolution-events-nl
index 933cdcf..b20f964 100644
--- a/etc/lighttpd/vhosts/evolution-events-nl
+++ b/etc/lighttpd/vhosts/evolution-events-nl
@@ -7,7 +7,11 @@ $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 += ( 
 		".php" => 
@@ -32,8 +36,6 @@ $HTTP["host"] =~ ".evolution-events.nl$" {
 	)
 
 	$HTTP["host"] =~ "^orga.evolution-events.nl$" {
-		auth.backend                 = "plain"
-		auth.backend.plain.userfile  = var.site-dir + "/conf/simple.user"
 
 		auth.require 	+= ( "/private" => 
 			( 
@@ -82,16 +84,29 @@ $HTTP["host"] =~ ".evolution-events.nl$" {
 		)
 
 		alias.url += (
-			"/media/" => "/home/matthijs/django/contrib/admin/media/",
-			"/static/" => var.site-dir + "/applications/xerxes/static/",
+			"/admin/media/" => "/usr/share/python-support/python-django/django/contrib/admin/media/",
+			"/media/" => var.site-dir + "/applications/xerxes/media/",
 		)
 
 		url.rewrite-once += (
-#			"^(/.*)$" => "/",
 			"^(/media.*)$" => "$1",
-			"^(/static.*)$" => "$1",
-			"^/favicon\.ico$" => "/media/favicon.ico",
+			"^(/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" )
+	}
 }