From 87c5ec96517b9f551f5a6100c9e689073369a669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Sat, 22 Aug 2015 20:51:08 +0000 Subject: [tests] search for perl in PATH instead of /usr/bin; whitespace + test config cleanups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Stefan Bühler git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3019 152afb58-edef-0310-8abb-c4023f1b3aa9 --- tests/condition.conf | 79 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 30 deletions(-) (limited to 'tests/condition.conf') diff --git a/tests/condition.conf b/tests/condition.conf index d1e88821..e0b36821 100644 --- a/tests/condition.conf +++ b/tests/condition.conf @@ -15,55 +15,74 @@ server.name = "www.example.org" server.tag = "Apache 1.3.29" -server.modules = ( - "mod_redirect", - "mod_accesslog" ) +server.modules = ( + "mod_redirect", + "mod_accesslog", +) ######################## MODULE CONFIG ############################ -accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" -mimetype.assign = ( ".html" => "text/html" ) +mimetype.assign = ( + ".html" => "text/html", +) -url.redirect = ("^" => "/default") +url.redirect = ( + "^" => "/default", +) $HTTP["host"] == "www.example.org" { - server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" - server.name = "www.example.org" - url.redirect = ("^" => "/match_1") + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" + server.name = "www.example.org" + url.redirect = ( + "^" => "/match_1", + ) } else $HTTP["host"] == "test1.example.org" { - server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" - server.name = "test1.example.org" - url.redirect = ("^" => "/match_2") + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" + server.name = "test1.example.org" + url.redirect = ( + "^" => "/match_2", + ) } # comments else $HTTP["host"] == "test2.example.org" { - server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" - server.name = "test2.example.org" - url.redirect = ("^" => "/match_3") + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" + server.name = "test2.example.org" + url.redirect = ( + "^" => "/match_3", + ) } # comments else $HTTP["host"] == "test3.example.org" { - server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" - server.name = "test3.example.org" - url.redirect = ("^" => "/match_4") - - # comments - $HTTP["url"] == "/index.html" { - url.redirect = ("^" => "/match_5") - } + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" + server.name = "test3.example.org" + url.redirect = ( + "^" => "/match_4", + ) + + # comments + $HTTP["url"] == "/index.html" { + url.redirect = ( + "^" => "/match_5", + ) + } } else $HTTP["host"] == "test4.example.org" { - server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" - server.name = "test4.example.org" - url.redirect = ("^" => "/match_6") - - $HTTP["url"] =~ "^/subdir/" { - url.redirect = ("^" => "/match_7") - } + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" + server.name = "test4.example.org" + url.redirect = ( + "^" => "/match_6", + ) + + $HTTP["url"] =~ "^/subdir/" { + url.redirect = ( + "^" => "/match_7", + ) + } } -- cgit v1.2.1