diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-12 17:41:53 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-02-12 17:41:53 +0000 |
commit | b230004897770ff8e29590263ddd6416b728af3a (patch) | |
tree | 1c132644b91954776b98649c17285d1c17d44b9a /railties/configs | |
parent | db2023d4d2094416faa5aec7265fa21cb800b69e (diff) | |
download | rails-b230004897770ff8e29590263ddd6416b728af3a.tar.gz rails-b230004897770ff8e29590263ddd6416b728af3a.tar.bz2 rails-b230004897770ff8e29590263ddd6416b728af3a.zip |
Changed default lighttpd.conf to use CWD from lighttpd 1.4.10 that allows the same configuration to be used for both detach and not. Also ensured that auto-repeaping of FCGIs only happens when lighttpd is not detached. [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3585 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/configs')
-rw-r--r-- | railties/configs/lighttpd.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/configs/lighttpd.conf b/railties/configs/lighttpd.conf index 3577360f7d..b450eef12c 100644 --- a/railties/configs/lighttpd.conf +++ b/railties/configs/lighttpd.conf @@ -7,8 +7,8 @@ server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi" ) server.error-handler-404 = "/dispatch.fcgi" server.document-root = "public/" -server.errorlog = "log/lighttpd.error.log" -accesslog.filename = "log/lighttpd.access.log" +server.errorlog = CWD + "/log/lighttpd.error.log" +accesslog.filename = CWD + "/log/lighttpd.access.log" url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" ) @@ -19,8 +19,8 @@ fastcgi.server = ( ".fcgi" => ( "min-procs" => 1, "max-procs" => 1, - "socket" => "log/fcgi.socket", - "bin-path" => "public/dispatch.fcgi", + "socket" => CWD + "/log/fcgi.socket", + "bin-path" => CWD + "/public/dispatch.fcgi", "bin-environment" => ( "RAILS_ENV" => "development" ) ) ) |