aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-29 16:12:00 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-29 16:12:00 -0300
commit4a39025643c95046db57fa391572573cc8871c2a (patch)
treeb41270a1434c3857d681366f5738883b58c7b0e7 /config
parentbf1e777b78e5b8039a54791ba16dd5e81c2f97d8 (diff)
downloadpfsense-packages-4a39025643c95046db57fa391572573cc8871c2a.tar.gz
pfsense-packages-4a39025643c95046db57fa391572573cc8871c2a.tar.bz2
pfsense-packages-4a39025643c95046db57fa391572573cc8871c2a.zip
Sanitize squidguard version, add port_category, run_depends and fix pbi checking
Diffstat (limited to 'config')
-rw-r--r--config/squidGuard/squidguard_configurator.inc12
1 files changed, 7 insertions, 5 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index 551ca542..99907451 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -121,7 +121,7 @@ define('REDIRECT_URL_ARGS', '&a=%a&n=%n&i=%i&s=%s&t=%t&u=%u');
# ------------------------------------------------------------------------------
-if ($pf_version > 2.0) {
+if ($pf_version == "2.0" || $pf_version == "2.2") {
if (file_exists('/usr/pbi/squidguard-squid3-' . php_uname("m")))
define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-squid3-' . php_uname("m"));
else
@@ -129,10 +129,12 @@ if ($pf_version > 2.0) {
} else
define('SQUIDGUARD_LOCALBASE','/usr/local');
-if (!defined('SQUID_LOCALBASE') && ($pf_version > 2.0))
- define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m"));
-elseif (!defined('SQUID_LOCALBASE'))
- define('SQUID_LOCALBASE','/usr/local');
+if (!defined('SQUID_LOCALBASE')) {
+ if ($pf_version == "2.0" || $pf_version == "2.2")
+ define('SQUID_LOCALBASE', '/usr/pbi/squid-' . php_uname("m"));
+ else
+ define('SQUID_LOCALBASE','/usr/local');
+}
define('SQUID_CONFIGFILE', SQUID_LOCALBASE . '/etc/squid/squid.conf');
define('TMP_DIR', '/var/tmp');