diff options
| author | jim-p <jimp@pfsense.org> | 2013-07-09 12:00:43 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-07-09 12:02:19 -0400 |
| commit | 1cf24f0aed3d67c4ba99c74ad951590d28474acc (patch) | |
| tree | 044feaaa4f491416f0d421b5c82a07f98d84201b /etc/inc/system.inc | |
| parent | f09c56002acb473566d1192266725d03d01745b1 (diff) | |
| download | pfsense-1cf24f0aed3d67c4ba99c74ad951590d28474acc.zip pfsense-1cf24f0aed3d67c4ba99c74ad951590d28474acc.tar.gz | |
Add independent logging choices to disable logging of bogon network rules and private network rules. Add upgrade code to obey the existing behavior for users (if default block logging was disabled, so is bogon/private rule blocking). Also add a checkbox to disable the lighttpd log for people who don't want their system log spammed by lighty.
Diffstat (limited to 'etc/inc/system.inc')
| -rw-r--r-- | etc/inc/system.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 5f5e179..0a5fba5 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -963,6 +963,14 @@ function system_generate_lighty_config($filename, else $fast_cgi_path = "{$g['tmp_path']}/php-fastcgi.socket"; + if(!isset($config['syslog']['nologlighttpd'])) { + $lighty_use_syslog = <<<EOD +## where to send error-messages to +server.errorlog-use-syslog="enable" +EOD; + } + + $fastcgi_config = <<<EOD #### fastcgi module ## read fastcgi.txt for more info @@ -1011,8 +1019,7 @@ server.document-root = "{$document_root}" # Maximum idle time with nothing being written (php downloading) server.max-write-idle = 999 -## where to send error-messages to -server.errorlog-use-syslog="enable" +{$lighty_use_syslog} # files to check for if .../ is requested server.indexfiles = ( "index.php", "index.html", |
