diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2013-06-17 23:13:23 +0200 |
|---|---|---|
| committer | PiBa-NL <pba_2k3@yahoo.com> | 2013-06-17 23:13:23 +0200 |
| commit | b373b72bb60dea4a33b4f6c8b87cf1860cca4de3 (patch) | |
| tree | bda4494b1a4b2a55db0a0997bf6f5200bc636119 | |
| parent | 0486d32f0b5f4d514f02f68c33f22f0864f20ac1 (diff) | |
| download | pfsense-packages-b373b72bb60dea4a33b4f6c8b87cf1860cca4de3.tar.gz pfsense-packages-b373b72bb60dea4a33b4f6c8b87cf1860cca4de3.tar.bz2 pfsense-packages-b373b72bb60dea4a33b4f6c8b87cf1860cca4de3.zip | |
haproxy-devel updated to version 1.5dev19, including support for 'transparent proxy'
| -rw-r--r-- | config/haproxy-devel/haproxy.inc | 2 | ||||
| -rw-r--r-- | config/haproxy-devel/haproxy_pool_edit.php | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 4 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc index 954e933f..4095f8cd 100644 --- a/config/haproxy-devel/haproxy.inc +++ b/config/haproxy-devel/haproxy.inc @@ -934,6 +934,8 @@ function haproxy_check_run($reload) { if(use_transparent_clientip_proxying()) load_ipfw_rules(); + else + mwexec("/usr/local/sbin/ipfw_context -d haproxy", true); if(isset($a_global['enable'])) { if (isset($a_global['carpdev'])) { diff --git a/config/haproxy-devel/haproxy_pool_edit.php b/config/haproxy-devel/haproxy_pool_edit.php index 4b93632f..a7a56b1c 100644 --- a/config/haproxy-devel/haproxy_pool_edit.php +++ b/config/haproxy-devel/haproxy_pool_edit.php @@ -491,7 +491,7 @@ foreach($simplefields as $field){ </table> </td> </tr> - <tr align="left" style="display:none;"> + <tr align="left"> <td width="22%" valign="top" class="vncell">Transparent ClientIP</td> <td width="78%" class="vtable" colspan="2"> <input id="transparent_clientip" name="transparent_clientip" type="checkbox" value="yes" <?php if ($pconfig['transparent_clientip']=='yes') echo "checked"; ?> onclick='updatevisibility();'> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 308c02c9..47ca6ccc 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -183,14 +183,14 @@ This package implements TCP, HTTP and HTTPS balance features from Haproxy.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5-dev18 pkg v 0.2</version> + <version>1.5-dev19 pkg v 0.3</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-dev18-i386.pbi</depends_on_package_pbi> + <depends_on_package_pbi>haproxy-devel-1.5-dev19-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 41b3715b..a21cc4f6 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -170,14 +170,14 @@ This package implements TCP, HTTP and HTTPS balance features from Haproxy.]]></descr> <website>http://haproxy.1wt.eu/</website> <category>Services</category> - <version>1.5-dev18 pkg v 0.2</version> + <version>1.5-dev19 pkg v 0.3</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-dev18-amd64.pbi</depends_on_package_pbi> + <depends_on_package_pbi>haproxy-devel-1.5-dev19-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> |