aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jim@pingle.org>2010-06-28 19:26:54 -0400
committerjim-p <jim@pingle.org>2010-06-28 19:26:54 -0400
commit849043c0705fcee1a5a6d4a9fac1b8b1a7f2a726 (patch)
treeb13a849318fcad5190719c636a7ef2acf916bec2
parentc46c958a65770acb90deac7027d54c7e33d8ac00 (diff)
downloadpfsense-packages-849043c0705fcee1a5a6d4a9fac1b8b1a7f2a726.tar.gz
pfsense-packages-849043c0705fcee1a5a6d4a9fac1b8b1a7f2a726.tar.bz2
pfsense-packages-849043c0705fcee1a5a6d4a9fac1b8b1a7f2a726.zip
Ensure /var/squid is owned by proxy:proxy or else squid can/will have issues.
-rw-r--r--config/squid/squid.inc13
1 files changed, 7 insertions, 6 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 54150805..bbc50313 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -40,6 +40,7 @@ if(!function_exists("filter_configure"))
require_once("filter.inc");
define('SQUID_CONFBASE', '/usr/local/etc/squid');
+define('SQUID_BASE', '/var/squid/');
define('SQUID_ACLDIR', '/var/squid/acl');
define('SQUID_PASSWD', '/var/etc/squid.passwd');
@@ -226,9 +227,9 @@ EOD;
foreach (array( SQUID_CONFBASE,
SQUID_ACLDIR,
- ) as $dir) {
- make_dirs($dir);
- squid_chown_recursive($dir, 'proxy', 'proxy');
+ SQUID_BASE ) as $dir) {
+ make_dirs($dir);
+ squid_chown_recursive($dir, 'proxy', 'proxy');
}
/* kill any running proxy alarm scripts */
@@ -1101,9 +1102,9 @@ function squid_resync() {
foreach (array( SQUID_CONFBASE,
SQUID_ACLDIR,
- ) as $dir) {
- make_dirs($dir);
- squid_chown_recursive($dir, 'proxy', 'proxy');
+ SQUID_BASE ) as $dir) {
+ make_dirs($dir);
+ squid_chown_recursive($dir, 'proxy', 'proxy');
}
file_put_contents(SQUID_CONFBASE . '/squid.conf', $conf);