merged [1105]

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.11-ssl-fixes@1283 152afb58-edef-0310-8abb-c4023f1b3aa9

1 files changed, 12 insertions, 12 deletions

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"
 }