summaryrefslogtreecommitdiffstats
path: root/src/etc/inc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-12-30 21:30:15 -0600
committerRenato Botelho <renato@netgate.com>2016-01-05 09:08:10 -0200
commitf77f43ff9113f2b28a7a836d05e372e5618dde1f (patch)
treebfb27ad3e6ae9e5907423750afaa706821378299 /src/etc/inc
parentc4104141e46edb44b8c0d376dabe3d01c7622d55 (diff)
downloadpfsense-f77f43ff9113f2b28a7a836d05e372e5618dde1f.zip
pfsense-f77f43ff9113f2b28a7a836d05e372e5618dde1f.tar.gz
Skip error_log when disabled.
Diffstat (limited to 'src/etc/inc')
-rw-r--r--src/etc/inc/system.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 66b0c91..181c68c 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1283,7 +1283,13 @@ pid {$g['varrun_path']}/{$pid_file};
user root wheel;
worker_processes {$max_procs};
-error_log syslog:server=unix:/var/run/log,facility=local5;
+EOD;
+
+if (!isset($config['syslog']['nolognginx'])) {
+ $nginx_config .= "error_log syslog:server=unix:/var/run/log,facility=local5;\n";
+}
+
+$nginx_config .= <<<EOD
events {
worker_connections 1024;
OpenPOWER on IntegriCloud