From 6819d263f06896759ae064259166af04d7091529 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 18 Dec 2014 08:59:24 -0200 Subject: This version is only for 2.2 and later, drop these checks --- config/squid3/34/squid.inc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'config/squid3') 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'); -- cgit v1.2.3