From d05507da5af503fcfad713c3ff24b1d849f951d0 Mon Sep 17 00:00:00 2001 From: marcelloc Date: Thu, 20 Sep 2012 11:26:35 -0300 Subject: squid - change pfsense version check to maintain compatibility with 1.2.3 http://forum.pfsense.org/index.php/topic,53809.msg287761.html#msg287761 --- config/squid/squid.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'config/squid') diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 8e426176..30f3884c 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -39,11 +39,12 @@ require_once('service-utils.inc'); if(!function_exists("filter_configure")) require_once("filter.inc"); -if (substr(trim(file_get_contents("/etc/version")),0,3) == "2.0") { - define('SQUID_LOCALBASE','/usr/local'); -} else { +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); +if ($pf_version > 2.0) define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m")); -} +else + define('SQUID_LOCALBASE','/usr/local'); + define('SQUID_CONFBASE',SQUID_LOCALBASE . '/etc/squid'); define('SQUID_BASE', '/var/squid/'); -- cgit v1.2.3