From e0977fed0fabd99dcfec0611bf27f133c85b24fd Mon Sep 17 00:00:00 2001 From: smos Date: Thu, 29 Mar 2012 12:20:03 +0200 Subject: [PATCH] Move some of the log file tabs around. Add seperate tabs for dnsmasq,unbound as well as gateways. --- etc/inc/priv.defs.inc | 18 ++++++++++++++++++ etc/inc/system.inc | 16 ++++++++++++++-- etc/rc | 2 +- usr/local/www/diag_logs.php | 14 ++++++++++++-- usr/local/www/diag_logs_auth.php | 1 - usr/local/www/diag_logs_dhcp.php | 1 - usr/local/www/diag_logs_filter.php | 1 - usr/local/www/diag_logs_filter_summary.php | 1 - usr/local/www/diag_logs_ipsec.php | 1 - usr/local/www/diag_logs_ntpd.php | 1 - usr/local/www/diag_logs_openvpn.php | 1 - usr/local/www/diag_logs_ppp.php | 1 - usr/local/www/diag_logs_relayd.php | 1 - usr/local/www/diag_logs_settings.php | 1 - usr/local/www/diag_logs_vpn.php | 1 - usr/local/www/diag_logs_wireless.php | 16 +++++++++++++--- 16 files changed, 58 insertions(+), 19 deletions(-) diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc index d74d831a65..c65dfdf074 100644 --- a/etc/inc/priv.defs.inc +++ b/etc/inc/priv.defs.inc @@ -114,6 +114,24 @@ $priv_list['page-diagnostics-logs-firewall']['descr'] = gettext("Allow access to $priv_list['page-diagnostics-logs-firewall']['match'] = array(); $priv_list['page-diagnostics-logs-firewall']['match'][] = "diag_logs_filter.php*"; +$priv_list['page-diagnostics-logs-gateways'] = array(); +$priv_list['page-diagnostics-logs-gateways']['name'] = gettext("WebCfg - Diagnostics: Logs: Gateways page"); +$priv_list['page-diagnostics-logs-gateways']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Gateways' page."); +$priv_list['page-diagnostics-logs-gateways']['match'] = array(); +$priv_list['page-diagnostics-logs-gateways']['match'][] = "diag_logs_gateways.php*"; + +$priv_list['page-diagnostics-logs-resolver'] = array(); +$priv_list['page-diagnostics-logs-resolver']['name'] = gettext("WebCfg - Diagnostics: Logs: Resolver page"); +$priv_list['page-diagnostics-logs-resolver']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Resolver' page."); +$priv_list['page-diagnostics-logs-resolver']['match'] = array(); +$priv_list['page-diagnostics-logs-resolver']['match'][] = "diag_logs_resolver.php*"; + +$priv_list['page-diagnostics-logs-wireless'] = array(); +$priv_list['page-diagnostics-logs-wireless']['name'] = gettext("WebCfg - Diagnostics: Logs: Wireless page"); +$priv_list['page-diagnostics-logs-wireless']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: System: Wireless' page."); +$priv_list['page-diagnostics-logs-wireless']['match'] = array(); +$priv_list['page-diagnostics-logs-wireless']['match'][] = "diag_logs_wireless.php*"; + $priv_list['page-hidden-nolongerincluded'] = array(); $priv_list['page-hidden-nolongerincluded']['name'] = gettext("WebCfg - Hidden: No longer included page"); $priv_list['page-hidden-nolongerincluded']['descr'] = gettext("Allow access to the 'Hidden: No longer included' page."); diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 5af42af96d..ccc5416b36 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, "*.*"); diff --git a/etc/rc b/etc/rc index 241509c73e..6ff3d2749f 100755 --- a/etc/rc +++ b/etc/rc @@ -258,7 +258,7 @@ fi echo -n "." DISABLESYSLOGCLOG=`/usr/bin/grep -c disablesyslogclog /cf/conf/config.xml` ENABLEFIFOLOG=`/usr/bin/grep -c usefifolog /cf/conf/config.xml` -LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppp relayd wireless lighttpd ntpd apinger" +LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppp relayd wireless lighttpd ntpd gateways resolver" for logfile in $LOG_FILES; do if [ "$DISABLESYSLOGCLOG" -gt "0" ]; then /usr/bin/touch /var/log/$logfile.log diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 2b80d6dd69..cff1a03261 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -62,7 +62,7 @@ if ($_POST['filtertext']) if ($filtertext) $filtertextmeta="?filtertext=$filtertext"; -$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("System")); +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("General")); include("head.inc"); ?> @@ -84,9 +84,19 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); +?> + + + + diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index e8f1ba9017..a6e97305be 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -72,7 +72,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 5eb44ccf89..438f7bbf36 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -77,7 +77,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index d490a06666..c30d67a4fd 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -108,7 +108,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index fb36dc4574..74e879336e 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -191,7 +191,6 @@ include("head.inc"); ?> $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 6ef2b4c959..9ed65a5224 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -109,7 +109,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 42dd7a233a..35d578c7ca 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -72,7 +72,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), true, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 6f2c55c99d..dd57b9daf3 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -76,7 +76,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), true, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php index 6459f44187..c58b589922 100755 --- a/usr/local/www/diag_logs_ppp.php +++ b/usr/local/www/diag_logs_ppp.php @@ -77,7 +77,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index e18000af69..3aac43170f 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -73,7 +73,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), true, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index be346121a6..666a361d8f 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -221,7 +221,6 @@ function check_everything() { $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), true, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index f511ef00ca..658b5bb4fe 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -133,7 +133,6 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); - $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_wireless.php b/usr/local/www/diag_logs_wireless.php index dc27e69408..6545d57feb 100644 --- a/usr/local/www/diag_logs_wireless.php +++ b/usr/local/www/diag_logs_wireless.php @@ -38,7 +38,7 @@ ##|+PRIV ##|*IDENT=page-status-systemlogs-wireless ##|*NAME=Status: System logs: Wireless page -##|*DESCR=Allow access to the 'Status: System logs: Wireless' page. +##|*DESCR=Allow access to the 'Status: System logs: System: Wireless' page. ##|*MATCH=diag_logs_wireless.php* ##|-PRIV @@ -64,7 +64,7 @@ include("head.inc"); + + + +