summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2014-04-28 08:08:59 +0000
committerErmal <eri@pfsense.org>2014-04-28 08:08:59 +0000
commit686777c41970740501d9d778931ef79a6b11b2d9 (patch)
tree0da8dec652b155cfca5acd09ae7c7098b4c05063
parent759a6fcf51283ce0996a36f211f14b8b18110eeb (diff)
downloadpfsense-686777c41970740501d9d778931ef79a6b11b2d9.zip
pfsense-686777c41970740501d9d778931ef79a6b11b2d9.tar.gz
Use the daemon name to send the filter logs
-rw-r--r--etc/inc/system.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 513b42a..3e6c912 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -723,10 +723,14 @@ function system_syslogd_start() {
if (isset($syslogcfg['hostapd']))
$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+ $syslogconf .= "!filterlog\n";
+ $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/filter.log\n";
+ if (isset($syslogcfg['filter']))
+ $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*");
+
$syslogconf .= "!-{$facilitylist}\n";
if (!isset($syslogcfg['disablelocallogging']))
$syslogconf .= <<<EOD
-local0.* {$log_directive}{$g['varlog_path']}/filter.log
local3.* {$log_directive}{$g['varlog_path']}/vpn.log
local4.* {$log_directive}{$g['varlog_path']}/portalauth.log
local7.* {$log_directive}{$g['varlog_path']}/dhcpd.log
@@ -739,8 +743,6 @@ auth.info;authpriv.info |exec /usr/local/sbin/sshlockout_pf 15
*.emerg *
EOD;
- if (isset($syslogcfg['filter']))
- $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "local0.*");
if (isset($syslogcfg['vpn']))
$syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "local3.*");
if (isset($syslogcfg['portalauth']))
OpenPOWER on IntegriCloud