mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move some of the log file tabs around.

Browse Source 
Add seperate tabs for dnsmasq,unbound as well as gateways.
This commit is contained in:
smos 2012-03-29 12:20:03 +02:00
parent 8e4893fc7b
commit e0977fed0f
16 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etc/inc/priv.defs.inc
View File

@ -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.");

16
etc/inc/system.inc
View File

@ -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, "*.*");

2
etc/rc
View File

@ -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

14
usr/local/www/diag_logs.php
View File

@ -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);
?>
</td>
</tr>
<tr><td class="tabnavtbl">
<?php
$tab_array = array();
$tab_array[] = array(gettext("General"), true, "/diag_logs.php");
$tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php");
$tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php");
$tab_array[] = array(gettext("Wireless"), false, "/diag_logs_wireless.php");
display_top_tabs($tab_array);
?>
</td>
</tr>

1
usr/local/www/diag_logs_auth.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_dhcp.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_filter.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_filter_summary.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_ipsec.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_ntpd.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_openvpn.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_ppp.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_relayd.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_settings.php
View File

@ -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);
?>

1
usr/local/www/diag_logs_vpn.php
View File

@ -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);
?>

16
usr/local/www/diag_logs_wireless.php
View File

@ -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");
<tr><td>
<?php
$tab_array = array();
$tab_array[] = array(gettext("System"), false, "diag_logs.php");
$tab_array[] = array(gettext("System"), true, "diag_logs.php");
$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
@ -74,11 +74,21 @@ 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"), true, "diag_logs_wireless.php");
$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
display_top_tabs($tab_array);
?>
</td></tr>
<tr><td class="tabnavtbl">
<?php
$tab_array = array();
$tab_array[] = array(gettext("General"), false, "/diag_logs.php");
$tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php");
$tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php");
$tab_array[] = array(gettext("Wireless"), true, "/diag_logs_wireless.php");
display_top_tabs($tab_array);
?>
</td>
</tr>
<tr>
<td>
<div id="mainarea">