From 6a6669a0919681284c05185246fc39de8dc06811 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 22 Jan 2015 18:40:48 -0200 Subject: Define the contants to /usr/local can be useful at development time in certain circumstances, but, it can lead squid3 package to change permissions of system directories and break important parts of the system. This seems to be the root cause of https://forum.pfsense.org/index.php?topic=87135.0 --- config/squid3/34/squid.inc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index e2c8c71a..ddea98f4 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -42,13 +42,8 @@ if(!function_exists("filter_configure")) require_once("filter.inc"); $shortcut_section = "squid"; -if (is_dir('/usr/pbi/squid-' . php_uname("m"))) { - define('SQUID_BASE', '/usr/pbi/squid-' . php_uname("m")); - define('SQUID_LOCALBASE', SQUID_BASE . "/local"); -} else { - define('SQUID_BASE', '/usr/local'); - define('SQUID_LOCALBASE', '/usr/local'); -} +define('SQUID_BASE', '/usr/pbi/squid-' . php_uname("m")); +define('SQUID_LOCALBASE', SQUID_BASE . "/local"); define('SQUID_CONFBASE', SQUID_LOCALBASE .'/etc/squid'); define('SQUID_CONFFILE', SQUID_CONFBASE . '/squid.conf'); -- cgit v1.2.3