diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
| commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
| tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /package/lighttpd/files | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'package/lighttpd/files')
| -rw-r--r-- | package/lighttpd/files/lighttpd.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/lighttpd/files/lighttpd.conf b/package/lighttpd/files/lighttpd.conf index ba28d2ab7..00e7aa699 100644 --- a/package/lighttpd/files/lighttpd.conf +++ b/package/lighttpd/files/lighttpd.conf @@ -138,13 +138,13 @@ server.pid-file = state_dir + "/lighttpd.pid" ## ## Path to the error log file ## -server.errorlog = log_root + "/error.log" +#server.errorlog = log_root + "/error.log" ## ## If you want to log to syslog you have to unset the ## server.errorlog setting and uncomment the next line. ## -#server.errorlog-use-syslog = "enable" +server.errorlog-use-syslog = "enable" ## ## Access log config |