diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2008-07-08 21:33:39 +0000 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2008-07-08 21:33:39 +0000 |
commit | 1348a09b4c84b0cc2cc89766758a2cd1a5b88ec1 (patch) | |
tree | a25a8997c5e91ffbb9081f206c27d083e779c445 /usr/local/www | |
parent | 651c32e24c07dd51e918d77ccebc63727cf6c8f6 (diff) | |
download | pfsense-1348a09b4c84b0cc2cc89766758a2cd1a5b88ec1.zip pfsense-1348a09b4c84b0cc2cc89766758a2cd1a5b88ec1.tar.gz |
Exit slbd, enter relayd
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 12 | ||||
-rw-r--r-- | usr/local/www/diag_logs_openvpn.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 95 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 2 |
10 files changed, 109 insertions, 14 deletions
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index c7e5e69..b6450d6 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -63,7 +63,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", true, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index c01f053..0b42e5f 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -65,7 +65,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 9654859..46bda83 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -196,7 +196,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index b9262b2..8ea82d8 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -222,7 +222,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 94b8ae0..a6b8ae6 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -85,7 +85,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", true, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 442d5c8..8217e4f 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -31,7 +31,7 @@ require("guiconfig.inc"); -$slbd_logfile = "{$g['varlog_path']}/ntpd.log"; +$ntpd_logfile = "{$g['varlog_path']}/ntpd.log"; $nentries = $config['syslog']['nentries']; if (!$nentries) @@ -39,11 +39,11 @@ if (!$nentries) if ($_POST['clear']) { if(isset($config['system']['disablesyslogclog'])) { - unlink($slbd_logfile); - touch($slbd_logfile); + unlink($ntpd_logfile); + touch($ntpd_logfile); } else { exec("killall syslogd"); - exec("/usr/sbin/clog -i -s 262144 {$slbd_logfile}"); + exec("/usr/sbin/clog -i -s 262144 {$ntpd_logfile}"); system_syslogd_start(); } } @@ -65,7 +65,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", true, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); @@ -80,7 +80,7 @@ include("head.inc"); <td colspan="2" class="listtopic"> Last <?=$nentries;?> OpenNTPD log entries</td> </tr> - <?php dump_clog($slbd_logfile, $nentries); ?> + <?php dump_clog($ntpd_logfile, $nentries); ?> <tr><td><br> <form action="diag_logs_ntpd.php" method="post"> <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 29261b8..24cb6d5 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -68,7 +68,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", true, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php new file mode 100755 index 0000000..05d0301 --- /dev/null +++ b/usr/local/www/diag_logs_relayd.php @@ -0,0 +1,95 @@ +<?php +/* $Id$ */ +/* + diag_logs_relayd.php + part of pfSense + + Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. + Copyright (C) 2008 Seth Mos <seth.mos@xs4all.nl>. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ + +require("guiconfig.inc"); + +$relayd_logfile = "{$g['varlog_path']}/relayd.log"; + +$nentries = $config['syslog']['nentries']; +if (!$nentries) + $nentries = 50; + +if ($_POST['clear']) { + if(isset($config['system']['disablesyslogclog'])) { + unlink($relayd_logfile); + touch($relayd_logfile); + } else { + exec("killall syslogd"); + exec("/usr/sbin/clog -i -s 262144 {$relayd_logfile}"); + system_syslogd_start(); + } +} + +$pgtitle = array("Status","System logs","Load Balancer"); +include("head.inc"); + +?> + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td> +<?php + $tab_array = array(); + $tab_array[] = array("System", false, "diag_logs.php"); + $tab_array[] = array("Firewall", false, "diag_logs_filter.php"); + $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); + $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); + $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); + $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("Load Balancer", true, "diag_logs_relayd.php"); + $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); + $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); + $tab_array[] = array("Settings", false, "diag_logs_settings.php"); + display_top_tabs($tab_array); +?> + </td></tr> + <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2" class="listtopic"> + Last <?=$nentries;?> Load Balancer log entries</td> + </tr> + <?php dump_clog($relayd_logfile, $nentries); ?> + <tr><td><br><form action="diag_logs_relayd.php" method="post"> +<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> + </table> + </div> +</form> + </td> + </tr> +</table> +<?php include("fend.inc"); ?> +</body> +</html> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 450afbe..e1993af 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -135,7 +135,7 @@ function enable_change(enable_over) { $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", true, "diag_logs_settings.php"); diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 4f2f9b9..8eefbbe 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -89,7 +89,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec VPN", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPTP VPN", true, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); + $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); $tab_array[] = array("Settings", false, "diag_logs_settings.php"); |