From e0977fed0fabd99dcfec0611bf27f133c85b24fd Mon Sep 17 00:00:00 2001 From: smos Date: Thu, 29 Mar 2012 12:20:03 +0200 Subject: Move some of the log file tabs around. Add seperate tabs for dnsmasq,unbound as well as gateways. --- etc/inc/system.inc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'etc/inc/system.inc') diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 5af42af..ccc5416 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -530,7 +530,7 @@ function system_syslogd_start() { } if (isset($syslogcfg)) { - $separatelogfacilities = array('ntpd','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd'); + $separatelogfacilities = array('ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','unbound','dhcpd','dhcrelay','apinger'); if($config['installedpackages']['package']) { foreach($config['installedpackages']['package'] as $package) { if($package['logging']) { @@ -581,7 +581,19 @@ function system_syslogd_start() { $syslogconf .= "!apinger\n"; if (!isset($syslogcfg['disablelocallogging'])) - $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/apinger.log\n"; + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/gateways.log\n"; + if (isset($syslogcfg['apinger'])) + $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*"); + + $syslogconf .= "!dnsmasq,unbound\n"; + if (!isset($syslogcfg['disablelocallogging'])) + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/resolver.log\n"; + if (isset($syslogcfg['apinger'])) + $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*"); + + $syslogconf .= "!dhcpd,dhcrelay\n"; + if (!isset($syslogcfg['disablelocallogging'])) + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/dhcpd.log\n"; if (isset($syslogcfg['apinger'])) $syslogconf .= system_syslogd_get_remote_servers($syslogcfg, "*.*"); -- cgit v1.1