aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-03-16 15:27:47 -0400
committerjim-p <jimp@pfsense.org>2015-03-16 15:27:47 -0400
commitfd2a5aeab821b902a078c2683b92a8c1908ad3df (patch)
treebcf6f31c33fa37bd1ebf76fd90bd55111fbaf5c5
parent659d3a7b8d1a8e726dd2867e9fd2916fac605234 (diff)
parent921f05b5f350ef0d39e93fe9b1c8efac7dd8b64d (diff)
downloadpfsense-packages-fd2a5aeab821b902a078c2683b92a8c1908ad3df.tar.gz
pfsense-packages-fd2a5aeab821b902a078c2683b92a8c1908ad3df.tar.bz2
pfsense-packages-fd2a5aeab821b902a078c2683b92a8c1908ad3df.zip
Merge pull request #834 from PiBa-NL/haproxy-devel21RELENG_2_2_1
-rw-r--r--config/haproxy-devel/pkg/haproxy.inc6
-rw-r--r--config/haproxy1_5/pkg/haproxy.inc6
-rw-r--r--pkg_config.10.xml4
-rw-r--r--pkg_config.8.xml4
-rw-r--r--pkg_config.8.xml.amd644
5 files changed, 12 insertions, 12 deletions
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index 15fbcd17..495f59c0 100644
--- a/config/haproxy-devel/pkg/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
@@ -1302,7 +1302,7 @@ function haproxy_writeconf($configpath) {
}
if ($inspectdelay > 0)
- fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "\n");
+ fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "s\n");
// Write acl's first, so they may be used by advanced text options written by user.
fwrite ($fd, $config_acls);
@@ -1897,9 +1897,9 @@ function get_frontend_acls($frontend) {
// Filter out acls for different modes
if ($acl['mode'] != '' && $acl['mode'] != strtolower($mainfrontend['type']))
continue;
- $not = $entry['not'] == "yes" ? "not " : "";
+ $not = $entry['not'] == "yes" ? "not: " : "";
$acl_item = array();
- $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $entry['value']);
+ $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $not . $entry['value']);
$acl_item['ref'] = $entry;
$result[] = $acl_item;
diff --git a/config/haproxy1_5/pkg/haproxy.inc b/config/haproxy1_5/pkg/haproxy.inc
index 15fbcd17..495f59c0 100644
--- a/config/haproxy1_5/pkg/haproxy.inc
+++ b/config/haproxy1_5/pkg/haproxy.inc
@@ -1302,7 +1302,7 @@ function haproxy_writeconf($configpath) {
}
if ($inspectdelay > 0)
- fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "\n");
+ fwrite ($fd, "\ttcp-request inspect-delay\t" . $inspectdelay . "s\n");
// Write acl's first, so they may be used by advanced text options written by user.
fwrite ($fd, $config_acls);
@@ -1897,9 +1897,9 @@ function get_frontend_acls($frontend) {
// Filter out acls for different modes
if ($acl['mode'] != '' && $acl['mode'] != strtolower($mainfrontend['type']))
continue;
- $not = $entry['not'] == "yes" ? "not " : "";
+ $not = $entry['not'] == "yes" ? "not: " : "";
$acl_item = array();
- $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $entry['value']);
+ $acl_item['descr'] = $acl['name'] . " " . (isset($acl['novalue']) ? "" : $not . $entry['value']);
$acl_item['ref'] = $entry;
$result[] = $acl_item;
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 620ee6b2..80c5d24a 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -137,7 +137,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.9 pkg v 0.21</version>
+ <version>1.5.9 pkg v 0.22</version>
<status>Release</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy1_5/haproxy.xml</config_file>
@@ -158,7 +158,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.9 pkg v 0.21</version>
+ <version>1.5.9 pkg v 0.22</version>
<status>Release</status>
<required_version>2.2</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 8a44f212..209deb0c 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -166,7 +166,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.21</version>
+ <version>1.5.3 pkg v 0.22</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy1_5/haproxy.xml</config_file>
@@ -190,7 +190,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.21</version>
+ <version>1.5.3 pkg v 0.22</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 431a50de..448a30d5 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -153,7 +153,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.21</version>
+ <version>1.5.3 pkg v 0.22</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy1_5/haproxy.xml</config_file>
@@ -177,7 +177,7 @@
Supports ACLs for smart backend switching.]]></descr>
<website>http://haproxy.1wt.eu/</website>
<category>Services</category>
- <version>1.5.3 pkg v 0.21</version>
+ <version>1.5.3 pkg v 0.22</version>
<status>Release</status>
<required_version>2.1</required_version>
<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>