aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-12-18 08:59:24 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-12-18 08:59:24 -0200
commit6819d263f06896759ae064259166af04d7091529 (patch)
tree959486f02086e8e6dd1748a2756a053a6f160459
parenta2defb23270719c616b0d8c5eaab5714e709a0ac (diff)
downloadpfsense-packages-6819d263f06896759ae064259166af04d7091529.tar.gz
pfsense-packages-6819d263f06896759ae064259166af04d7091529.tar.bz2
pfsense-packages-6819d263f06896759ae064259166af04d7091529.zip
This version is only for 2.2 and later, drop these checks
-rwxr-xr-xconfig/squid3/34/squid.inc10
1 files changed, 1 insertions, 9 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index 87232c2b..1cfe7dcd 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -42,15 +42,7 @@ if(!function_exists("filter_configure"))
require_once("filter.inc");
$shortcut_section = "squid";
-$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
-if (is_dir('/usr/pbi/squid-' . php_uname("m"))) {
- if ($pfs_version == 2.2)
- define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m")."/local");
- else
- define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m"));
-} else {
- define('SQUID_LOCALBASE','/usr/local');
-}
+define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m")."/local");
define('SQUID_CONFBASE', SQUID_LOCALBASE .'/etc/squid');
define('SQUID_CONFFILE', SQUID_CONFBASE . '/squid.conf');