diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-04-07 15:35:12 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-07 15:35:12 -0300 |
| commit | 68f78d106986f2bc12fa3f3e57d35edd503ab448 (patch) | |
| tree | 31d993dcda100e412eab76b74f51440390ead7e9 | |
| parent | e194ac796ff97ddde13eea2710cf07a83a1a2e58 (diff) | |
| parent | 39586fc3a015d466c725851a76f229ebc5266f4f (diff) | |
| download | pfsense-packages-68f78d106986f2bc12fa3f3e57d35edd503ab448.tar.gz pfsense-packages-68f78d106986f2bc12fa3f3e57d35edd503ab448.tar.bz2 pfsense-packages-68f78d106986f2bc12fa3f3e57d35edd503ab448.zip | |
Merge pull request #828 from nliaudat/patch-1
| -rw-r--r-- | config/squidGuard/squidguard.xml | 2 | ||||
| -rw-r--r-- | config/squidGuard/squidguard_configurator.inc | 17 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/config/squidGuard/squidguard.xml b/config/squidGuard/squidguard.xml index 3a77edf3..7f3036ba 100644 --- a/config/squidGuard/squidguard.xml +++ b/config/squidGuard/squidguard.xml @@ -6,7 +6,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>squidguardgeneral</name> - <version>1.4_4 pkg v.1.9.8</version> + <version>1.4_7 pkg v.1.9.11</version> <title>Proxy filter SquidGuard: General settings</title> <include_file>/usr/local/pkg/squidguard.inc</include_file> <!-- Installation --> diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index d3448c5d..38104c89 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'); +} else { + define('REDIRECTOR_PROGRAM_OPT', 'redirect_program'); + define('REDIRECT_BYPASS_OPT', 'redirector_bypass'); + define('REDIRECTOR_PROCESS_COUNT', '5'); +} # ------------------------------------------------------------------------------ # 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")); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 72b7ebff..25928ae0 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -990,7 +990,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_7 pkg v.1.9.10</version> + <version>1.4_7 pkg v.1.9.11</version> <status>Beta</status> <required_version>2.2</required_version> <depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi> |