From 8d65afe8cd7a9a1bc72a5c42f3be209ac511eb2c Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 1 Jul 2015 16:39:46 +0200
Subject: [PATCH] syslog: move ppp.log to ppps.log to prevent newsyslog
 clobbering it

---
 src/etc/inc/system.inc    | 2 +-
 src/etc/rc                | 2 +-
 src/www/diag_logs_ppp.php | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 94d05d4be..9c572baa8 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -667,7 +667,7 @@ function system_syslogd_start()
 
 		$syslogconf .= "!ppp\n";
 		if (!isset($syslogcfg['disablelocallogging']))
-			$syslogconf .= "*.*								{$log_directive}/var/log/ppp.log\n";
+			$syslogconf .= "*.*								{$log_directive}/var/log/ppps.log\n";
 
 		$syslogconf .= "!pptps\n";
 		if (!isset($syslogcfg['disablelocallogging']))
diff --git a/src/etc/rc b/src/etc/rc
index f4bdaaba0..5918a07fb 100755
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -186,7 +186,7 @@ chmod 1777 /tmp
 echo -n "."
 DISABLESYSLOGCLOG=`/usr/bin/grep -c disablesyslogclog /conf/config.xml`
 ENABLEFIFOLOG=`/usr/bin/grep -c usefifolog /conf/config.xml`
-LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppp relayd wireless lighttpd ntpd gateways resolver routing"
+LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppps relayd wireless lighttpd ntpd gateways resolver routing"
 
 DEFAULT_LOG_FILE_SIZE=`/usr/local/bin/xmllint --xpath 'string(//opnsense/syslog/logfilesize)' /conf/config.xml`
 if [ ! ${DEFAULT_LOG_FILE_SIZE} ]; then
diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php
index 2ae94e336..019c28e82 100644
--- a/src/www/diag_logs_ppp.php
+++ b/src/www/diag_logs_ppp.php
@@ -30,7 +30,7 @@
 
 require_once("guiconfig.inc");
 
-$ppp_logfile = '/var/log/ppp.log';
+$ppps_logfile = '/var/log/ppps.log';
 
 $nentries = $config['syslog']['nentries'];
 if (!$nentries) {
@@ -38,7 +38,7 @@ if (!$nentries) {
 }
 
 if ($_POST['clear']) {
-	clear_log_file($ppp_logfile);
+	clear_log_file($ppps_logfile);
 }
 
 $pgtitle = array(gettext("Status"),gettext("System logs"),gettext("PPP"));
@@ -69,7 +69,7 @@ include("head.inc");
 
 								 <div class="table-responsive">
 									<table class="table table-striped table-sort">
-										<?php dump_clog($ppp_logfile, $nentries); ?>
+										<?php dump_clog($ppps_logfile, $nentries); ?>
 									</table>
 								 </div>