X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fevolution-events-nl;h=7084a2f9352ea541fe21a229299160656354bca6;hb=a73e0429667aa897d78217a70cabdbae5ffecd98;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..7084a2f 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" => ( @@ -42,11 +44,14 @@ $HTTP["host"] =~ ".evolution-events.nl$" { "require" => "user=admin" ) ) - + $HTTP["url"] =~ "^/private/" { + # Enable dirlistings for /private + server.dir-listing = "enable" + } + } - url.rewrite-once += ( - "^/forum/(.+)$" => "/forum/", - ) + $HTTP["host"] =~ "^orga-forum.evolution-events.nl$" { + url.redirect = ( ".*" => "http://orga.evolution-events.nl/forum" ) } $HTTP["host"] =~ "^hunter-net.evolution-events.nl$" { @@ -71,6 +76,19 @@ $HTTP["host"] =~ ".evolution-events.nl$" { "^(/.*)$" => "/blaa$1", ) } + $HTTP["host"] =~ "^dorestad(1493)?.evolution-events.nl$" { + fastcgi.server += ( + "/reserveren" => + (( + "socket" => var.site-fcgi-dir + "/dorestad-bookings", + "check-local" => "disable", + )), + ) + + alias.url += ( + "/admin/media/" => var.site-dir + "/applications/dorestad-bookings/python-virtualenv/lib/python2.5/site-packages/Django-1.2.3-py2.5.egg/django/contrib/admin/media/", + ) + } $HTTP["host"] =~ "^xerxes.evolution-events.nl$" { fastcgi.server += ( @@ -82,16 +100,49 @@ $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" ) + } + + # Redirect old forum urls + $HTTP["host"] =~ "^deadfoxjunction.evolution-events.nl$" { + url.redirect += ( "^/forum(/.*)?$" => "http://www.evolution-events.nl/forum/viewforum.php?f=58" ) + } + $HTTP["host"] =~ "^blackbox.evolution-events.nl$" { + url.redirect += ( "^/forum(/.*)?$" => "http://www.evolution-events.nl/forum/viewforum.php?f=57" ) + } + $HTTP["host"] =~ "^exit.evolution-events.nl$" { + url.redirect += ( "^/forum(/.*)?$" => "http://www.evolution-events.nl/forum/viewforum.php?f=72" ) + } + $HTTP["host"] =~ "^lextalionis.evolution-events.nl$" { + url.redirect += ( "^/forum(/.*)?$" => "http://www.evolution-events.nl/forum/viewforum.php?f=75" ) + } + $HTTP["host"] =~ "^exodus.evolution-events.nl$" { + url.redirect += ( "^/forum(/.*)?$" => "http://www.evolution-events.nl/forum/viewforum.php?f=74" ) + } + $HTTP["host"] =~ "^nyderpunxt.evolution-events.nl$" { + url.redirect += ( "^/forum(/.*)?$" => "http://www.evolution-events.nl/forum/viewforum.php?f=73" ) + } }