From 906f6b71b894a5e73505cde7d44745da0454b686 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 15 Mar 2009 19:06:50 -0400
Subject: Jettison clog.  Man overboard!

---
 etc/inc/system.inc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 0ae3a52..9453b40 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -353,7 +353,7 @@ function system_syslogd_start() {
 					$separatelogfacilities = $separatelogfacilities + $pkgfacilities;
 					$facilitylist = implode(',', $pkgfacilities);
 					mwexec("fifolog_create -s 10000 {$g['varlog_path']}/{$package['logging']['logfilename']}");
-                                	$syslogconf .= "!{$facilitylist}\n*.*\t\t\t\t\t\t%{$g['varlog_path']}/{$package['logging']['logfilename']}\n";
+                                	$syslogconf .= "!{$facilitylist}\n*.*\t\t\t\t\t\t|fiflog_writer {$g['varlog_path']}/{$package['logging']['logfilename']}\n";
 				}
                         }
                 }
@@ -367,14 +367,14 @@ function system_syslogd_start() {
 		$syslogconf .= "!ntpdate,!ntpd\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= <<<EOD
-*.*						%{$g['varlog_path']}/ntpd.log
+*.*						|fiflog_writer {$g['varlog_path']}/ntpd.log
 
 EOD;
 		}
 		$syslogconf .= "!racoon\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= <<<EOD
-*.*						%{$g['varlog_path']}/ipsec.log
+*.*						|fiflog_writer {$g['varlog_path']}/ipsec.log
 
 EOD;
 		}
@@ -387,7 +387,7 @@ EOD;
 		$syslogconf .= "!openvpn\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 			$syslogconf .= <<<EOD
-*.*						%{$g['varlog_path']}/openvpn.log
+*.*						|fiflog_writer {$g['varlog_path']}/openvpn.log
 
 EOD;
 		}
@@ -400,16 +400,16 @@ EOD;
 		$syslogconf .= "!-{$facilitylist}\n";
 		if (!isset($syslogcfg['disablelocallogging'])) {
 		$syslogconf .= <<<EOD
-local0.*					%{$g['varlog_path']}/filter.log
-local3.*					%{$g['varlog_path']}/vpn.log
-local4.*					%{$g['varlog_path']}/portalauth.log
-local7.*					%{$g['varlog_path']}/dhcpd.log
-*.notice;kern.debug;lpr.info;mail.crit; 	%{$g['varlog_path']}/system.log
-news.err;local0.none;local3.none;local4.none; 	%{$g['varlog_path']}/system.log
-local7.none					%{$g['varlog_path']}/system.log
-security.*					%{$g['varlog_path']}/system.log
-auth.info;authpriv.info;daemon.info		%{$g['varlog_path']}/system.log
-local1.*					%{$g['varlog_path']}/relayd.log
+local0.*					|fiflog_writer {$g['varlog_path']}/filter.log
+local3.*					|fiflog_writer {$g['varlog_path']}/vpn.log
+local4.*					|fiflog_writer {$g['varlog_path']}/portalauth.log
+local7.*					|fiflog_writer {$g['varlog_path']}/dhcpd.log
+*.notice;kern.debug;lpr.info;mail.crit; 	|fiflog_writer {$g['varlog_path']}/system.log
+news.err;local0.none;local3.none;local4.none; 	|fiflog_writer {$g['varlog_path']}/system.log
+local7.none					|fiflog_writer {$g['varlog_path']}/system.log
+security.*					|fiflog_writer {$g['varlog_path']}/system.log
+auth.info;authpriv.info;daemon.info		|fiflog_writer {$g['varlog_path']}/system.log
+local1.*					|fiflog_writer {$g['varlog_path']}/relayd.log
 auth.info;authpriv.info 			|exec /usr/local/sbin/sshlockout_pf
 *.emerg						*
 
-- 
cgit v1.1