diff options
| author | marcelloc <marcellocoutinho@gmail.com> | 2012-09-20 11:26:35 -0300 |
|---|---|---|
| committer | Marcello Coutinho <marcellocoutinho@gmail.com> | 2012-09-20 11:26:35 -0300 |
| commit | d05507da5af503fcfad713c3ff24b1d849f951d0 (patch) | |
| tree | c1e532db25486f62482071ada669db5b1744b660 | |
| parent | 76442fe5d7e80e3099a805b3cada22b190455db9 (diff) | |
| download | pfsense-packages-d05507da5af503fcfad713c3ff24b1d849f951d0.tar.gz pfsense-packages-d05507da5af503fcfad713c3ff24b1d849f951d0.tar.bz2 pfsense-packages-d05507da5af503fcfad713c3ff24b1d849f951d0.zip | |
squid - change pfsense version check to maintain compatibility with 1.2.3
http://forum.pfsense.org/index.php/topic,53809.msg287761.html#msg287761
| -rw-r--r-- | config/squid/squid.inc | 9 |
1 files changed, 5 insertions, 4 deletions
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/'); |