diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-01-14 19:43:24 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-01-14 19:43:24 -0200 |
| commit | 8fe2482aafadf5604213a910ad4c60fd351a2fad (patch) | |
| tree | b9708b32c92501d9c6bb0da725085a813bf449f0 | |
| parent | b0e4a534caa55d4226283fb1783dd9b1212906eb (diff) | |
| parent | cfad6024f1f69ff1b743eb2b1cf5355f19321464 (diff) | |
| download | pfsense-packages-8fe2482aafadf5604213a910ad4c60fd351a2fad.tar.gz pfsense-packages-8fe2482aafadf5604213a910ad4c60fd351a2fad.tar.bz2 pfsense-packages-8fe2482aafadf5604213a910ad4c60fd351a2fad.zip | |
Merge pull request #787 from CinoNY/patch-2
| -rw-r--r-- | config/squidGuard-devel/squidguard_configurator.inc | 6 | ||||
| -rw-r--r-- | config/squidGuard/squidguard_configurator.inc | 6 | ||||
| -rw-r--r-- | pkg_config.10.xml | 8 | ||||
| -rw-r--r-- | pkg_config.8.xml | 8 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/config/squidGuard-devel/squidguard_configurator.inc b/config/squidGuard-devel/squidguard_configurator.inc index a48426bb..ff2b9f2c 100644 --- a/config/squidGuard-devel/squidguard_configurator.inc +++ b/config/squidGuard-devel/squidguard_configurator.inc @@ -93,10 +93,10 @@ define('CONFIG_SG_HEADER', " # squid config options # ------------------------------------------------------------------------------ define('REDIRECTOR_OPTIONS_REM', '# squidGuard options'); -define('REDIRECTOR_PROGRAM_OPT', 'redirect_program'); -define('REDIRECT_BYPASS_OPT', 'redirector_bypass'); +define('REDIRECTOR_PROGRAM_OPT', 'url_rewrite_program'); +define('REDIRECT_BYPASS_OPT', 'url_rewrite_bypass'); define('REDIRECT_CHILDREN_OPT', 'url_rewrite_children'); -define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started +define('REDIRECTOR_PROCESS_COUNT', '16 startup=8 idle=4 concurrency=0'); # redirector processes count will started # ------------------------------------------------------------------------------ # squidguard config options diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index d3448c5d..66ad88a3 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -92,10 +92,10 @@ define('CONFIG_SG_HEADER', " # squid config options # ------------------------------------------------------------------------------ define('REDIRECTOR_OPTIONS_REM', '# squidGuard options'); -define('REDIRECTOR_PROGRAM_OPT', 'redirect_program'); -define('REDIRECT_BYPASS_OPT', 'redirector_bypass'); +define('REDIRECTOR_PROGRAM_OPT', 'url_rewrite_program'); +define('REDIRECT_BYPASS_OPT', 'url_rewrite_bypass'); define('REDIRECT_CHILDREN_OPT', 'url_rewrite_children'); -define('REDIRECTOR_PROCESS_COUNT', '5'); # redirector processes count will started +define('REDIRECTOR_PROCESS_COUNT', '16 startup=8 idle=4 concurrency=0'); # redirector processes count will started # ------------------------------------------------------------------------------ # squidguard config options diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 2094fa95..13ccd5db 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -985,7 +985,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_4 pkg v.1.9.8</version> + <version>1.4_7 pkg v.1.9.9</version> <status>Beta</status> <required_version>2.2</required_version> <depends_on_package_pbi>squidguard-1.4_7-##ARCH##.pbi</depends_on_package_pbi> @@ -1003,7 +1003,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>gugabsd@mundounix.com.br</maintainer> <category>Network Management</category> - <version>1.5_1.5 beta</version> + <version>1.5_1beta pkg v.1.5.6</version> <status>Beta</status> <required_version>2.2</required_version> <depends_on_package_pbi>squidguard-devel-1.5_1-##ARCH##.pbi</depends_on_package_pbi> @@ -1022,8 +1022,8 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_4 pkg v.1.9.5</version> - <status>Experimental</status> + <version>1.4_4 pkg v.1.9.6</version> + <status>Beta</status> <required_version>2.2</required_version> <depends_on_package_pbi>squidguard-squid3-1.4_4-##ARCH##.pbi</depends_on_package_pbi> <build_pbi> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index d6093dbc..7b54e3c7 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1268,7 +1268,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_4 pkg v.1.9.8</version> + <version>1.4_4 pkg v.1.9.9</version> <status>Beta</status> <required_version>1.1</required_version> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> @@ -1293,7 +1293,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>gugabsd@mundounix.com.br</maintainer> <category>Network Management</category> - <version>1.5_1.1 beta</version> + <version>1.5_1beta pkg v.1.5.6</version> <status>Beta</status> <required_version>2.1</required_version> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> @@ -1313,8 +1313,8 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_4 pkg v.1.9.5</version> - <status>Experimental</status> + <version>1.4_4 pkg v.1.9.6</version> + <status>Beta</status> <required_version>2.1</required_version> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> <depends_on_package_pbi>squidguard-squid3-1.4_4-i386.pbi</depends_on_package_pbi> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 30bdeba9..fd49ef3f 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1255,7 +1255,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_4 pkg v.1.9.8</version> + <version>1.4_4 pkg v.1.9.9</version> <status>Beta</status> <required_version>1.1</required_version> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> @@ -1280,7 +1280,7 @@ <website>http://www.squidGuard.org/</website> <maintainer>gugabsd@mundounix.com.br</maintainer> <category>Network Management</category> - <version>1.5_1.1 beta</version> + <version>1.5_1beta pkg v.1.5.6</version> <status>Beta</status> <required_version>2.1</required_version> <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url> @@ -1300,8 +1300,8 @@ <website>http://www.squidGuard.org/</website> <maintainer>dv_serg@mail.ru</maintainer> <category>Network Management</category> - <version>1.4_4 pkg v.1.9.5</version> - <status>Experimental</status> + <version>1.4_4 pkg v.1.9.6</version> + <status>Beta</status> <required_version>2.1</required_version> <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> <depends_on_package_pbi>squidguard-squid3-1.4_4-amd64.pbi</depends_on_package_pbi> |