diff options
author | Jan Kneschke <jan@kneschke.de> | 2006-09-07 11:11:30 +0000 |
---|---|---|
committer | Jan Kneschke <jan@kneschke.de> | 2006-09-07 11:11:30 +0000 |
commit | 352165750867d6f0f819ee1af83f69dbab6c195b (patch) | |
tree | b5501bec5877fc6904270f1e1cf0965a4c595057 /tests | |
parent | 3b73da83a279f80233bd468743b1931af162a80a (diff) | |
download | lighttpd-git-352165750867d6f0f819ee1af83f69dbab6c195b.tar.gz |
merged [1105]
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.11-ssl-fixes@1283 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/LightyTest.pm | 5 | ||||
-rw-r--r-- | tests/bug-06.conf | 20 | ||||
-rw-r--r-- | tests/bug-12.conf | 20 | ||||
-rw-r--r-- | tests/condition.conf | 16 | ||||
-rw-r--r-- | tests/fastcgi-10.conf | 16 | ||||
-rw-r--r-- | tests/fastcgi-13.conf | 16 | ||||
-rw-r--r-- | tests/fastcgi-auth.conf | 20 | ||||
-rw-r--r-- | tests/fastcgi-responder.conf | 18 | ||||
-rw-r--r-- | tests/lighttpd.conf | 24 | ||||
-rw-r--r-- | tests/lowercase.conf | 10 | ||||
-rw-r--r-- | tests/proxy.conf | 20 | ||||
-rw-r--r-- | tests/var-include.conf | 12 |
12 files changed, 98 insertions, 99 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index 85a08efb..81f92922 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -87,12 +87,11 @@ sub start_proc { # pre-process configfile if necessary # - unlink($self->{TESTDIR}."/tmp/cfg.file"); - system("cat ".$self->{SRCDIR}."/".$self->{CONFIGFILE}.' | perl -pe "s#\@SRCDIR\@#'.$self->{BASEDIR}.'/tests/#" > '.$self->{TESTDIR}.'/tmp/cfg.file'); + $ENV{'SRCDIR'} = $self->{BASEDIR}.'/tests'; unlink($self->{LIGHTTPD_PIDFILE}); if (1) { - system($self->{LIGHTTPD_PATH}." -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{MODULES_PATH}); + system($self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}); } else { system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{MODULES_PATH}." &"); } diff --git a/tests/bug-06.conf b/tests/bug-06.conf index 5273c4ac..b094e882 100644 --- a/tests/bug-06.conf +++ b/tests/bug-06.conf @@ -1,5 +1,5 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## bind to port (default: 80) server.port = 2048 @@ -8,7 +8,7 @@ server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -59,7 +59,7 @@ server.indexfiles = ( "index.html", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -77,7 +77,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") setenv.add-environment = ( "TRAC_ENV" => "foo") @@ -90,7 +90,7 @@ fastcgi.server = ( ".php" => ( "host" => "127.0.0.1", "port" => 1026, # "mode" => "authorizer", -# "docroot" => "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/", +# "docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/", ) ) ) @@ -106,7 +106,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -149,15 +149,15 @@ status.status-url = "/server-status" status.config-url = "/server-config" simple-vhost.document-root = "pages" -simple-vhost.server-root = "@SRCDIR@/tmp/lighttpd/servers/" +simple-vhost.server-root = env.SRCDIR + "/tmp/lighttpd/servers/" simple-vhost.default-host = "www.example.org" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } diff --git a/tests/bug-12.conf b/tests/bug-12.conf index 491ff9e9..49aa16b5 100644 --- a/tests/bug-12.conf +++ b/tests/bug-12.conf @@ -1,5 +1,5 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## bind to port (default: 80) server.port = 2048 @@ -8,7 +8,7 @@ server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -61,7 +61,7 @@ server.error-handler-404 = "/indexfile/return-404.php" ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -79,7 +79,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") setenv.add-environment = ( "TRAC_ENV" => "foo") @@ -92,7 +92,7 @@ fastcgi.server = ( ".php" => ( "host" => "127.0.0.1", "port" => 1026, # "mode" => "authorizer", -# "docroot" => "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/", +# "docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/", ) ) ) @@ -108,7 +108,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -151,15 +151,15 @@ status.status-url = "/server-status" status.config-url = "/server-config" simple-vhost.document-root = "pages" -simple-vhost.server-root = "@SRCDIR@/tmp/lighttpd/servers/" +simple-vhost.server-root = env.SRCDIR + "/tmp/lighttpd/servers/" simple-vhost.default-host = "www.example.org" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } diff --git a/tests/condition.conf b/tests/condition.conf index 7fd58d7e..92c05add 100644 --- a/tests/condition.conf +++ b/tests/condition.conf @@ -2,15 +2,15 @@ debug.log-request-handling = "enable" debug.log-condition-handling = "enable" -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## bind to port (default: 80) server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -22,25 +22,25 @@ server.modules = ( ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".html" => "text/html" ) url.redirect = ("^" => "/default") $HTTP["host"] == "www.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + 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 = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + 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 = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "test2.example.org" url.redirect = ("^" => "/match_3") } @@ -48,7 +48,7 @@ else $HTTP["host"] == "test2.example.org" { # comments else $HTTP["host"] == "test3.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "test3.example.org" url.redirect = ("^" => "/match_4") diff --git a/tests/fastcgi-10.conf b/tests/fastcgi-10.conf index 1300973a..c13d5649 100644 --- a/tests/fastcgi-10.conf +++ b/tests/fastcgi-10.conf @@ -1,12 +1,12 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## bind to port (default: 80) server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -44,7 +44,7 @@ server.indexfiles = ( "index.php", "index.html", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -62,7 +62,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") fastcgi.debug = 0 @@ -85,7 +85,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -128,11 +128,11 @@ status.status-url = "/server-status" status.config-url = "/server-config" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } diff --git a/tests/fastcgi-13.conf b/tests/fastcgi-13.conf index f351208e..c4adf62f 100644 --- a/tests/fastcgi-13.conf +++ b/tests/fastcgi-13.conf @@ -1,5 +1,5 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" debug.log-request-header = "enable" debug.log-response-header = "enable" @@ -10,7 +10,7 @@ server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -59,7 +59,7 @@ server.indexfiles = ( "index.php", "index.html", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -77,7 +77,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") fastcgi.debug = 0 @@ -102,7 +102,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -145,11 +145,11 @@ status.status-url = "/server-status" status.config-url = "/server-config" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } diff --git a/tests/fastcgi-auth.conf b/tests/fastcgi-auth.conf index c55700cf..a375e934 100644 --- a/tests/fastcgi-auth.conf +++ b/tests/fastcgi-auth.conf @@ -1,5 +1,5 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" debug.log-request-header = "enable" debug.log-response-header = "enable" @@ -12,7 +12,7 @@ server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -61,7 +61,7 @@ server.indexfiles = ( "index.php", "index.html", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -79,7 +79,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") fastcgi.debug = 0 @@ -87,9 +87,9 @@ fastcgi.server = ( "/" => ( "grisu" => ( "host" => "127.0.0.1", "port" => 20000, - "bin-path" => "@SRCDIR@/fcgi-auth", + "bin-path" => env.SRCDIR + "/fcgi-auth", "mode" => "authorizer", - "docroot" => "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/", + "docroot" => env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/", ) ) @@ -106,7 +106,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -149,11 +149,11 @@ status.status-url = "/server-status" status.config-url = "/server-config" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } diff --git a/tests/fastcgi-responder.conf b/tests/fastcgi-responder.conf index 7ced64bd..65b88bd7 100644 --- a/tests/fastcgi-responder.conf +++ b/tests/fastcgi-responder.conf @@ -1,5 +1,5 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" #debug.log-request-header = "enable" #debug.log-response-header = "enable" @@ -15,7 +15,7 @@ server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -64,7 +64,7 @@ server.indexfiles = ( "index.php", "index.html", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -82,7 +82,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") fastcgi.debug = 0 @@ -90,7 +90,7 @@ fastcgi.server = ( ".fcgi" => ( "grisu" => ( "host" => "127.0.0.1", "port" => 10000, - "bin-path" => "@SRCDIR@/fcgi-responder", + "bin-path" => env.SRCDIR + "/fcgi-responder", "check-local" => "disable", "max-procs" => 1, "min-procs" => 1 @@ -109,7 +109,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -152,11 +152,11 @@ status.status-url = "/server-status" status.config-url = "/server-config" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf index 1d08bb9b..2426925c 100644 --- a/tests/lighttpd.conf +++ b/tests/lighttpd.conf @@ -1,7 +1,7 @@ debug.log-request-handling = "enable" debug.log-condition-handling = "enable" -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## 64 Mbyte ... nice limit server.max-request-size = 65000 @@ -11,7 +11,7 @@ server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -49,7 +49,7 @@ server.indexfiles = ( "index.php", "index.html", ssi.extension = ( ".shtml" ) -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -68,7 +68,7 @@ mimetype.assign = ( ".png" => "image/png", ".conf" => "text/plain" ) $HTTP["host"] == "cache.example.org" { - compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" + compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" } compress.filetype = ("text/plain", "text/html") @@ -101,9 +101,9 @@ $HTTP["host"] == "auth-htpasswd.example.org" { } auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" -auth.backend.htpasswd.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.htpasswd" +auth.backend.htpasswd.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.htpasswd" auth.require = ( "/server-status" => @@ -135,15 +135,15 @@ status.status-url = "/server-status" status.config-url = "/server-config" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" secdownload.secret = "verysecret" - secdownload.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + secdownload.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" secdownload.uri-prefix = "/sec/" secdownload.timeout = 120 } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } @@ -160,13 +160,13 @@ $HTTP["host"] == "nosymlink.example.org" { } $HTTP["host"] == "no-simple.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/123.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/123.example.org/pages/" server.name = "zzz.example.org" } $HTTP["host"] !~ "(no-simple\.example\.org)" { simple-vhost.document-root = "pages" - simple-vhost.server-root = "@SRCDIR@/tmp/lighttpd/servers/" + simple-vhost.server-root = env.SRCDIR + "/tmp/lighttpd/servers/" simple-vhost.default-host = "www.example.org" } diff --git a/tests/lowercase.conf b/tests/lowercase.conf index bedf1456..60eb40fd 100644 --- a/tests/lowercase.conf +++ b/tests/lowercase.conf @@ -1,12 +1,12 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## bind to port (default: 80) server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.force-lowercase-filenames = "enable" @@ -57,9 +57,9 @@ cgi.assign = ( ".pl" => "/usr/bin/perl", ".py" => "/usr/bin/python" ) auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" -auth.backend.htpasswd.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.htpasswd" +auth.backend.htpasswd.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.htpasswd" $HTTP["host"] == "lowercase-auth" { auth.require = ( "/image.jpg" => diff --git a/tests/proxy.conf b/tests/proxy.conf index e272b2ff..473ae06b 100644 --- a/tests/proxy.conf +++ b/tests/proxy.conf @@ -1,12 +1,12 @@ -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd-proxy.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd-proxy.pid" ## bind to port (default: 80) server.port = 2050 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Proxy" @@ -42,7 +42,7 @@ server.indexfiles = ( "index.php", "index.html", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".png" => "image/png", ".jpg" => "image/jpeg", @@ -60,7 +60,7 @@ mimetype.assign = ( ".png" => "image/png", ".c" => "text/plain", ".conf" => "text/plain" ) -compress.cache-dir = "@SRCDIR@/tmp/lighttpd/cache/compress/" +compress.cache-dir = env.SRCDIR + "/tmp/lighttpd/cache/compress/" compress.filetype = ("text/plain", "text/html") setenv.add-environment = ( "TRAC_ENV" => "foo") @@ -88,7 +88,7 @@ ssl.engine = "disable" ssl.pemfile = "server.pem" auth.backend = "plain" -auth.backend.plain.userfile = "@SRCDIR@/tmp/lighttpd/lighttpd.user" +auth.backend.plain.userfile = env.SRCDIR + "/tmp/lighttpd/lighttpd.user" auth.backend.plain.groupfile = "lighttpd.group" auth.backend.ldap.hostname = "localhost" @@ -135,22 +135,22 @@ status.status-url = "/server-status" status.config-url = "/server-config" $HTTP["host"] == "vvv.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" } $HTTP["host"] == "zzz.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "zzz.example.org" } $HTTP["host"] == "no-simple.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/123.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/123.example.org/pages/" server.name = "zzz.example.org" } $HTTP["host"] !~ "(no-simple\.example\.org)" { simple-vhost.document-root = "pages" - simple-vhost.server-root = "@SRCDIR@/tmp/lighttpd/servers/" + simple-vhost.server-root = env.SRCDIR + "/tmp/lighttpd/servers/" simple-vhost.default-host = "www.example.org" } diff --git a/tests/var-include.conf b/tests/var-include.conf index 00595ba6..397c91d3 100644 --- a/tests/var-include.conf +++ b/tests/var-include.conf @@ -2,15 +2,15 @@ debug.log-request-handling = "enable" debug.log-condition-handling = "enable" -server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" -server.pid-file = "@SRCDIR@/tmp/lighttpd/lighttpd.pid" +server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" +server.pid-file = env.SRCDIR + "/tmp/lighttpd/lighttpd.pid" ## bind to port (default: 80) server.port = 2048 ## bind to localhost (default: all interfaces) server.bind = "localhost" -server.errorlog = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.error.log" +server.errorlog = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.error.log" server.name = "www.example.org" server.tag = "Apache 1.3.29" @@ -21,19 +21,19 @@ server.modules = ( "mod_redirect", ######################## MODULE CONFIG ############################ -accesslog.filename = "@SRCDIR@/tmp/lighttpd/logs/lighttpd.access.log" +accesslog.filename = env.SRCDIR + "/tmp/lighttpd/logs/lighttpd.access.log" mimetype.assign = ( ".html" => "text/html" ) url.redirect = ("^" => "/default") $HTTP["host"] == "www.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "www.example.org" url.redirect = ("^" => "/redirect") } $HTTP["host"] == "test.example.org" { - server.document-root = "@SRCDIR@/tmp/lighttpd/servers/www.example.org/pages/" + server.document-root = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/" server.name = "test.example.org" var.myvar = "good" var.one = 1 |