aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Liaudat <nliaudat@users.noreply.github.com>2015-02-25 16:41:49 +0100
committerNicolas Liaudat <nliaudat@users.noreply.github.com>2015-02-25 16:41:49 +0100
commitf91970e1c1fa76630fb1fdd51a9aca54bd5f05d1 (patch)
treeb59f2f4615fed68b644dd271a6955078f62422ca
parent275c6d8796ee47be261045c4d53618562f8b42e7 (diff)
downloadpfsense-packages-f91970e1c1fa76630fb1fdd51a9aca54bd5f05d1.tar.gz
pfsense-packages-f91970e1c1fa76630fb1fdd51a9aca54bd5f05d1.tar.bz2
pfsense-packages-f91970e1c1fa76630fb1fdd51a9aca54bd5f05d1.zip
Update squidguard_configurator.inc
Fix commit eb7182a & it's revert to finaly works for everybody :)
-rw-r--r--config/squidGuard/squidguard_configurator.inc17
1 files changed, 13 insertions, 4 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index d3448c5d..6b2b944c 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -91,11 +91,20 @@ define('CONFIG_SG_HEADER', "
# ------------------------------------------------------------------------------
# squid config options
# ------------------------------------------------------------------------------
+
+$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+
define('REDIRECTOR_OPTIONS_REM', '# squidGuard options');
-define('REDIRECTOR_PROGRAM_OPT', 'redirect_program');
-define('REDIRECT_BYPASS_OPT', 'redirector_bypass');
define('REDIRECT_CHILDREN_OPT', 'url_rewrite_children');
-define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started
+if ($pf_version >= 2.2) {
+ define('REDIRECTOR_PROGRAM_OPT', 'url_rewrite_program');
+ define('REDIRECT_BYPASS_OPT', 'url_rewrite_bypass');
+ define('REDIRECTOR_PROCESS_COUNT', '16 startup=8 idle=4 concurrency=0');# redirector processes count will started
+} else {
+ define('REDIRECTOR_PROGRAM_OPT', 'redirect_program');
+ define('REDIRECT_BYPASS_OPT', 'redirector_bypass');
+ define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started
+}
# ------------------------------------------------------------------------------
# squidguard config options
@@ -111,7 +120,7 @@ define('REDIRECT_URL_ARGS', '&a=%a&n=%n&i=%i&s=%s&t=%t&u=%u');
# squidguard system constants
# ------------------------------------------------------------------------------
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
+
if ($pf_version > 2.0) {
if (file_exists('/usr/pbi/squidguard-squid3-' . php_uname("m")))
define('SQUIDGUARD_LOCALBASE', '/usr/pbi/squidguard-squid3-' . php_uname("m"));