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/upgrade_config.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/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index fad204e..f7c5240 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3111,4 +3111,12 @@ function upgrade_095_to_096() { enable_rrd_graphing(); } +function upgrade_096_to_097() { + global $config, $g; + /* If the user had disabled default block rule logging before, then bogon/private network logging was already off, so respect their choice. */ + if (isset($config['syslog']['nologdefaultblock'])) { + $config['syslog']['nologbogons'] = true; + $config['syslog']['nologprivatenets'] = true; + } +} ?> |