diff options
| author | Ermal Luçi <eri@pfsense.org> | 2014-02-17 08:34:09 +0100 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2014-02-17 08:34:09 +0100 |
| commit | d600815f517a8d937a3dc2c468f1c5e5ee305124 (patch) | |
| tree | c7527dc8dc5eebf7cf3861f840b8e5fa24e7b234 | |
| parent | 085d9fbf916b389037799bd74fa10e1da3c60f27 (diff) | |
| parent | 60ff2a97b8f9b0cd138997acab21d84e9e3d49ef (diff) | |
| download | pfsense-packages-d600815f517a8d937a3dc2c468f1c5e5ee305124.tar.gz pfsense-packages-d600815f517a8d937a3dc2c468f1c5e5ee305124.tar.bz2 pfsense-packages-d600815f517a8d937a3dc2c468f1c5e5ee305124.zip | |
Merge pull request #587 from PiBa-NL/hap_dev22
haproxy-devel use version 1.5dev22
| -rw-r--r-- | config/haproxy-devel/haproxy.inc | 1 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 6 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index 5e798dc2..934834bf 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -617,6 +617,7 @@ function haproxy_writeconf($configpath) { fwrite ($fd, "\tnbproc\t\t\t$numprocs\n"); fwrite ($fd, "\tchroot\t\t\t/var/empty\n"); fwrite ($fd, "\tdaemon\n"); + fwrite ($fd, "\tssl-server-verify none\n"); // Keep the advanced options on the bottom of the global settings, to allow additional sections to be easely added if($a_global['advanced']) { diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 869fb93b..86243ec7 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -187,7 +187,7 @@ Supports acl's for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5-dev22 pkg v 0.6.1</version> + <version>1.5-dev22 pkg v 0.7</version> <status>Release</status> <required_version>2.2</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy-devel/haproxy.xml</config_file> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a35b7e6b..b3f16cb2 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -192,14 +192,14 @@ Supports acl's for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5-dev21 pkg v 0.6.1</version> + <version>1.5-dev22 pkg v 0.7</version> <status>Release</status> <required_version>2.1</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy-devel/haproxy.xml</config_file> <configurationfile>haproxy.xml</configurationfile> <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url> - <depends_on_package>haproxy-1.4.21.tbz</depends_on_package> - <depends_on_package_pbi>haproxy-devel-1.5-dev21-i386.pbi</depends_on_package_pbi> + <depends_on_package>haproxy-1.4.22.tbz</depends_on_package> + <depends_on_package_pbi>haproxy-devel-1.5-dev22-i386.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/net/haproxy-devel</build_port_path> <build_pbi> <ports_before>security/openssl</ports_before> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index d09981cf..f628aff4 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -179,14 +179,14 @@ Supports acl's for smart backend switching.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5-dev21 pkg v 0.6.1</version> + <version>1.5-dev22 pkg v 0.7</version> <status>Release</status> <required_version>2.1</required_version> <config_file>http://www.pfsense.com/packages/config/haproxy-devel/haproxy.xml</config_file> <configurationfile>haproxy.xml</configurationfile> <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url> - <depends_on_package>haproxy-1.4.21.tbz</depends_on_package> - <depends_on_package_pbi>haproxy-devel-1.5-dev21-amd64.pbi</depends_on_package_pbi> + <depends_on_package>haproxy-1.4.22.tbz</depends_on_package> + <depends_on_package_pbi>haproxy-devel-1.5-dev22-amd64.pbi</depends_on_package_pbi> <build_port_path>/usr/ports/net/haproxy-devel</build_port_path> <build_pbi> <ports_before>security/openssl</ports_before> |