From: Matthijs Kooijman Date: Wed, 24 Jun 2009 16:56:50 +0000 (+0200) Subject: lighttpd: Use += instead of = to increase robustness. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=inline;h=7f4a1471860d0fc34109a8b9deef5c4fb965b1ad;p=matthijs%2Fservers%2Fdrsnuggles.git lighttpd: Use += instead of = to increase robustness. = might overwrite other settings, while += will preserve them. --- diff --git a/etc/lighttpd/vhosts/evolution-events-nl b/etc/lighttpd/vhosts/evolution-events-nl index ca5e1bf..610be9f 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", @@ -22,12 +22,12 @@ $HTTP["host"] =~ ".evolution-events.nl$" { "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", ) @@ -36,7 +36,7 @@ $HTTP["host"] =~ ".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 +45,13 @@ $HTTP["host"] =~ ".evolution-events.nl$" { ) - url.rewrite-once = ( + url.rewrite-once += ( "^/forum/(.+)$" => "/forum/", ) } $HTTP["host"] =~ "^xerxes.evolution-events.nl$" { - fastcgi.server = ( + fastcgi.server += ( "/blaa" => (( "socket" => var.site-fcgi-dir + "/xerxes", @@ -59,12 +59,12 @@ $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",