X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Flighttpd%2Fvhosts%2Fevolution-events-nl;h=933cdcfcb4448a1f5ff847d6e7f5fc70910d154f;hb=887963279cdd00f8302b480f2e542ee42c65f72e;hp=ca5e1bf55e79175045896e6836831c6e87a96b2a;hpb=202368ea600f1c63978b6e130adb9e47d3d752d3;p=matthijs%2Fservers%2Fdrsnuggles.git diff --git a/etc/lighttpd/vhosts/evolution-events-nl b/etc/lighttpd/vhosts/evolution-events-nl index ca5e1bf..933cdcf 100644 --- a/etc/lighttpd/vhosts/evolution-events-nl +++ b/etc/lighttpd/vhosts/evolution-events-nl @@ -9,7 +9,7 @@ $HTTP["host"] =~ ".evolution-events.nl$" { evhost.path-pattern = var.site-dir + "/htdocs/%3/" accesslog.filename = var.site-dir + "/logs/access.log" - fastcgi.server = ( + fastcgi.server += ( ".php" => (( "socket" => var.site-fcgi-dir + "/php", @@ -19,24 +19,23 @@ $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", @@ -45,13 +44,36 @@ $HTTP["host"] =~ ".evolution-events.nl$" { ) - url.rewrite-once = ( + url.rewrite-once += ( "^/forum/(.+)$" => "/forum/", ) } + $HTTP["host"] =~ "^hunter-net.evolution-events.nl$" { + fastcgi.server += ( + "/blaa" => + (( + "socket" => var.site-fcgi-dir + "/hunternet", + "check-local" => "disable", + )), + ) + + alias.url += ( + "/media/" => "/usr/share/python-support/python-django/django/contrib/admin/media/", + "/static/" => var.site-dir + "/applications/xerxes/media/", + ) + + url.rewrite-once += ( +# "^(/.*)$" => "/", + "^(/media.*)$" => "$1", + "^(/static.*)$" => "$1", + "^/favicon\.ico$" => "/media/favicon.ico", + "^(/.*)$" => "/blaa$1", + ) + } + $HTTP["host"] =~ "^xerxes.evolution-events.nl$" { - fastcgi.server = ( + fastcgi.server += ( "/blaa" => (( "socket" => var.site-fcgi-dir + "/xerxes", @@ -59,12 +81,13 @@ $HTTP["host"] =~ ".evolution-events.nl$" { )), ) - alias.url = ( + alias.url += ( "/media/" => "/home/matthijs/django/contrib/admin/media/", "/static/" => var.site-dir + "/applications/xerxes/static/", ) - url.rewrite-once = ( + url.rewrite-once += ( +# "^(/.*)$" => "/", "^(/media.*)$" => "$1", "^(/static.*)$" => "$1", "^/favicon\.ico$" => "/media/favicon.ico",