lighttpd/evolution-events.nl: Move authentication info out of conditional.

[matthijs/servers/drsnuggles.git] / etc / lighttpd / vhosts / evolution-events-nl

diff --git a/etc/lighttpd/vhosts/evolution-events-nl b/etc/lighttpd/vhosts/evolution-events-nl
index 933cdcfcb4448a1f5ff847d6e7f5fc70910d154f..8807091cb4174af84aa7d0164471c27fc1de1b6d 100644 (file)
--- 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" => 
                        ( 
@@ -94,4 +96,18 @@ $HTTP["host"] =~ ".evolution-events.nl$" {
                        "^(/.*)$" => "/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" )
+       }
 }