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, 10 insertions, 10 deletions

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