diff options
-rw-r--r-- | etc/inc/system.inc | 9 | ||||
-rw-r--r-- | etc/inc/vpn.inc | 6 | ||||
-rwxr-xr-x | etc/rc | 9 | ||||
-rwxr-xr-x | usr/local/www/diag_logs.php | 2 | ||||
-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 | ||||
-rw-r--r-- | usr/local/www/diag_logs_filter_summary.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 2 | ||||
-rw-r--r-- | usr/local/www/diag_logs_openvpn.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ppp.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_slbd.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 39 |
17 files changed, 65 insertions, 24 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 89ad72e..73e241c 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -451,6 +451,15 @@ function system_syslogd_start() { $syslogconf .= "!ppp\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/ppp.log\n"; + $syslogconf .= "!pptp\n"; + if (!isset($syslogcfg['disablelocallogging'])) + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/pptp.log\n"; + $syslogconf .= "!pppoe\n"; + if (!isset($syslogcfg['disablelocallogging'])) + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/pppoe.log\n"; + $syslogconf .= "!l2tp\n"; + if (!isset($syslogcfg['disablelocallogging'])) + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/l2pp.log\n"; $syslogconf .= "!racoon\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/ipsec.log\n"; diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 1ebd07a..3aba988 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -1125,7 +1125,7 @@ EOD; chmod("{$g['varetc_path']}/pptp-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pptp-vpn -p {$g['varrun_path']}/pptp-vpn.pid -f mpd.conf pptpd"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pptp-vpn -p {$g['varrun_path']}/pptp-vpn.pid -s pptp -f mpd.conf pptpd"); break; @@ -1318,7 +1318,7 @@ EOD; chmod("{$g['varetc_path']}/pppoe-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pppoe-vpn -p {$g['varrun_path']}/pppoe-vpn.pid pppoe"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/pppoe-vpn -p {$g['varrun_path']}/pppoe-vpn.pid -s pppoe pppoe"); break; @@ -1498,7 +1498,7 @@ EOD; chmod("{$g['varetc_path']}/l2tp-vpn/mpd.secret", 0600); /* fire up mpd */ - mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/l2tp-vpn -p {$g['varrun_path']}/l2tp-vpn.pid l2tp"); + mwexec("/usr/local/sbin/mpd4 -b -d {$g['varetc_path']}/l2tp-vpn -p {$g['varrun_path']}/l2tp-vpn.pid -s l2tp l2tp"); break; @@ -231,6 +231,9 @@ if [ "$DISABLESYSLOGCLOG" -gt "0" ]; then touch /var/log/filter.log touch /var/log/dhcpd.log touch /var/log/vpn.log + touch /var/log/pptp.log + touch /var/log/pppoe.log + touch /var/log/l2tp.log touch /var/log/openvpn.log touch /var/log/portalauth.log touch /var/log/ipsec.log @@ -246,6 +249,9 @@ else /usr/sbin/fifolog_create -s 511488 /var/log/filter.log /usr/sbin/fifolog_create -s 50688 /var/log/dhcpd.log /usr/sbin/fifolog_create -s 50688 /var/log/vpn.log + /usr/sbin/fifolog_create -s 50688 /var/log/pptp.log + /usr/sbin/fifolog_create -s 50688 /var/log/pppoe.log + /usr/sbin/fifolog_create -s 50688 /var/log/lt2p.log /usr/sbin/fifolog_create -s 50688 /var/log/openvpn.log /usr/sbin/fifolog_create -s 50688 /var/log/portalauth.log /usr/sbin/fifolog_create -s 50688 /var/log/ipsec.log @@ -258,6 +264,9 @@ else /usr/sbin/clog -i -s 512144 /var/log/filter.log /usr/sbin/clog -i -s 65535 /var/log/dhcpd.log /usr/sbin/clog -i -s 65535 /var/log/vpn.log + /usr/sbin/clog -i -s 50688 /var/log/pptp.log + /usr/sbin/clog -i -s 50688 /var/log/pppoe.log + /usr/sbin/clog -i -s 50688 /var/log/lt2p.log /usr/sbin/clog -i -s 65535 /var/log/openvpn.log /usr/sbin/clog -i -s 65535 /var/log/portalauth.log /usr/sbin/clog -i -s 65535 /var/log/ipsec.log diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 02d7ead..0d03b91 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -80,7 +80,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 25a8e16..700b6dc 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -68,7 +68,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", true, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 7317980..b95b969 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -70,7 +70,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index cf54410..9d8d9cd 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -104,7 +104,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index d537241..a07b52b 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -103,7 +103,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index 2f27d9a..115bb12 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -187,7 +187,7 @@ include("head.inc"); ?> $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index aeb8aec..039193b 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -90,7 +90,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", true, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 20b559b..d168f70 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -68,7 +68,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 50a6098..aa50856 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -72,7 +72,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php index 792ad5d..470d33d 100755 --- a/usr/local/www/diag_logs_ppp.php +++ b/usr/local/www/diag_logs_ppp.php @@ -73,7 +73,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", true, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index b80b700..f267c74 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -69,7 +69,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("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"); diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 5c02cd9..f2b7861 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -172,7 +172,7 @@ function enable_change(enable_over) { $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.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"); diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index 3be210e..c55809a 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -69,7 +69,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", false, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", true, "diag_logs_slbd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 9019f89..83d0ecd 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -36,12 +36,12 @@ ##|+PRIV ##|*IDENT=page-diagnostics-logs-pptpvpn -##|*NAME=Diagnostics: Logs: PPTP VPN page -##|*DESCR=Allow access to the 'Diagnostics: Logs: PPTP VPN' page. +##|*NAME=Diagnostics: Logs: VPN page +##|*DESCR=Allow access to the 'Diagnostics: Logs: VPN' page. ##|*MATCH=diag_logs_vpn.php* ##|-PRIV -$pgtitle = array("Status","System logs","PPTP VPN"); +$pgtitle = array("Status","System logs","VPN"); require("guiconfig.inc"); require_once("vpn.inc"); @@ -49,8 +49,15 @@ $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; +if ($_GET['vpntype']) + $vpntype = $_GET['vpntype']; +else + $vpntype = "pptp"; +if ($_POST['vpntype']) + $vpntype = $_POST['vpntype']; + if ($_POST['clear']) - clear_log_file("/var/log/vpn.log"); + clear_log_file("/var/log/{$vpntype}.log"); function dump_clog_vpn($logfile, $tail) { global $g, $config; @@ -97,7 +104,7 @@ include("head.inc"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); - $tab_array[] = array("PPTP VPN", true, "diag_logs_vpn.php"); + $tab_array[] = array("VPN", true, "diag_logs_vpn.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"); @@ -107,9 +114,24 @@ include("head.inc"); </td></tr> <tr> <td class="tabcont"> +<form action="diag_logs_vpn.php" method="post"> <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr> <td colspan="4" class="listtopic"> - Last <?=$nentries;?> PPTP VPN log entries</td> + Choose which type of VPN you want to view. + </td></tr><tr> + <td colspan="4"> + <?php $vpns = array("pptp" => "PPTP", "pppoe" => "PPPoE", "l2tp" => "L2TP"); + foreach ($vpns as $kvpn => $dvpn): + ?> + <a href="/diag_logs_vpn.php?vpntype=<?=$kvpn;?>" > + <input type="button" name="<?=$dvpn;?>" value="<?=$dvpn;?>"> + </a> + <?php endforeach; ?> + + </td></tr> + <tr> + <td colspan="4" class="listtopic"> + Last <?=$nentries;?> <?=$vpns[$vpntype];?> VPN log entries</td> </tr> <tr> <td class="listhdrr">Time</td> @@ -117,9 +139,10 @@ include("head.inc"); <td class="listhdrr">User</td> <td class="listhdrr">IP address</td> </tr> - <?php dump_clog_vpn("/var/log/vpn.log", $nentries); ?> + <?php dump_clog_vpn("/var/log/{$vpntype}.log", $nentries); ?> </table> - <br><form action="diag_logs_vpn.php" method="post"> +<br /> +<input type="hidden" name="vpntype" id="vpntype" value="<?=$vpntype;?>"> <input name="clear" type="submit" class="formbtn" value="Clear log"> </form> </td> |