From 890801af42cff66dbac8706f621256b8d454a234 Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Thu, 18 Dec 2014 09:16:11 -0200 Subject: Revert 6819d263 partially since it can be useful for development tests --- config/squid3/34/squid.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index 6a5de479..a2917515 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -42,8 +42,13 @@ if(!function_exists("filter_configure")) require_once("filter.inc"); $shortcut_section = "squid"; -define('SQUID_BASE', '/usr/pbi/squid-' . php_uname("m")); -define('SQUID_LOCALBASE', SQUID_BASE . "/local"); +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_CONFBASE', SQUID_LOCALBASE .'/etc/squid'); define('SQUID_CONFFILE', SQUID_CONFBASE . '/squid.conf'); -- cgit v1.2.3