Add a real ipsec.log file and redirect syslog entries to it

4 files changed, 10 insertions, 5 deletions

diff --git a/etc/rc b/etc/rc
index 1f397cd..d2a8b8d 100755
--- a/etc/rc
+++ b/etc/rc
@@ -98,12 +98,14 @@ if [ ! "$PLATFORM" = "cdrom" ]; then
     clog -i -s 10000 /var/log/dhcpd.log
     clog -i -s 10000 /var/log/vpn.log
     clog -i -s 10000 /var/log/portalauth.log
+    clog -i -s 10000 /var/log/ipsec.log
 else
     clog -i -s 262144 /var/log/system.log
     clog -i -s 262144 /var/log/filter.log
     clog -i -s 32768 /var/log/dhcpd.log
     clog -i -s 32768 /var/log/vpn.log
     clog -i -s 32768 /var/log/portalauth.log
+    clog -i -s 10000 /var/log/ipsec.log
 fi
 
 # change permissions on newly created clog files.
diff --git a/etc/syslog.conf b/etc/syslog.conf
index 03f5022..45786f3 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -2,7 +2,10 @@ local0.*					%/var/log/filter.log
 local3.*					%/var/log/vpn.log
 local4.*					%/var/log/portalauth.log
 local7.*					%/var/log/dhcpd.log
-*.notice;kern.debug;lpr.info;mail.crit;news.err;local0.none;local3.none;local4.none;local7.none	%/var/log/system.log
-security.*					%/var/log/system.log
+local7.none                                     %/var/log/system.log
+*.notice;kern.debug;lpr.info;mail.crit;         %/var/log/system.log
+news.err;;local3.none;local4.none;              %/var/log/system.log
+local0.none                                     %/var/log/system.log
+security.*					%/var/log/ipsec.log
 auth.info;authpriv.info;daemon.info		%/var/log/system.log
 auth.info;authpriv.info                         |exec /usr/local/sbin/sshlockout_pf
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 4ab0a9c..778dde1 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -73,7 +73,7 @@ include("head.inc");
 			<td colspan="2" class="listtopic">
 			  Last <?=$nentries;?> IPSEC log entries</td>
 		  </tr>
-		  <?php dump_clog($ipsec_logfile, $nentries, true, array("racoon"), array(false)); ?>
+		  <tr><td><?php dump_clog_vpn($ipsec_logfile, $nentries); ?>
 		<tr><td><br><form action="diag_logs.php" method="post">
 <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr>
 		</table>
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 630f540..cc9c18a 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -34,14 +34,14 @@
 
 require("guiconfig.inc");
 
-$pptp_logfile = "{$g['varlog_path']}/vpn.log";
+$pptp_logfile = "{$g['varlog_path']}/ipsec.log";
 
 $nentries = $config['syslog']['nentries'];
 if (!$nentries)
 	$nentries = 50;
 
 if ($_POST['clear']) {
-	exec("/usr/sbin/clog -i -s 262144 {$pptp_logfile}");
+	exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}");
 }
 
 function dump_clog_vpn($logfile, $tail) {