From 53fdca7021876f5e698c0a6b115a5a22956f3c8b Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 29 Jun 2010 08:28:43 -0400
Subject: Correct default logging path so it matches lightsquid's default.

---
 config/squid/squid.inc | 4 ++--
 config/squid/squid.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index bbc50313..86fb61a0 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -268,7 +268,7 @@ function squid_deinstall_command() {
 	squid_install_cron(false);
 	$settings = &$config['installedpackages']['squidcache']['config'][0];
 	$cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache');
-	$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log');
+	$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
 	update_status("Removing swap.state ... One moment please...");
 	update_output_window("$plswait_txt");
 	mwexec('rm -rf $cachedir/swap.state');
@@ -618,7 +618,7 @@ function squid_resync_general() {
 	$hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
 	$email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost');
 
-	$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log');
+	$logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs');
 
 	$logdir_cache = $logdir . '/cache.log';
 	$logdir_access = ($settings['log_enabled'] == 'on' ? $logdir . '/access.log' : '/dev/null');
diff --git a/config/squid/squid.xml b/config/squid/squid.xml
index 01669087..91019bed 100644
--- a/config/squid/squid.xml
+++ b/config/squid/squid.xml
@@ -195,7 +195,7 @@
 			<type>input</type>
 			<size>60</size>
 			<required/>
-			<default_value>/var/squid/log</default_value>
+			<default_value>/var/squid/logs</default_value>
 		</field>
 		<field>
 			<fielddescr>Log rotate</fielddescr>
-- 
cgit v1.2.3