aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-12-18 09:16:11 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-12-18 09:16:11 -0200
commit890801af42cff66dbac8706f621256b8d454a234 (patch)
treebf92b6e0e8592a14a0ff518ba1832e36358bab27
parent2d6c4184d3a3a440854bb189728518eb1dd9ff17 (diff)
downloadpfsense-packages-890801af42cff66dbac8706f621256b8d454a234.tar.gz
pfsense-packages-890801af42cff66dbac8706f621256b8d454a234.tar.bz2
pfsense-packages-890801af42cff66dbac8706f621256b8d454a234.zip
Revert 6819d263 partially since it can be useful for development tests
-rwxr-xr-xconfig/squid3/34/squid.inc9
1 files changed, 7 insertions, 2 deletions
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');