From d529f5eda199344e285f111d12d0115720677e1c Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Tue, 3 Nov 2015 23:21:48 +0100 Subject: haproxy-devel, update package to use 1.6.2 binaries --- config/haproxy-devel/haproxy.xml | 2 +- config/haproxy-devel/pkg/haproxy.inc | 6 ++++++ pkg_config.10.xml | 4 ++-- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml index 784e0034..19b6b577 100644 --- a/config/haproxy-devel/haproxy.xml +++ b/config/haproxy-devel/haproxy.xml @@ -42,7 +42,7 @@ ]]> haproxy - 0.32 + 0.33 HAProxy /pkg_edit.php?xml=haproxy_pools.php /usr/local/pkg/haproxy.inc diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index 638ece28..714b041c 100644 --- a/config/haproxy-devel/pkg/haproxy.inc +++ b/config/haproxy-devel/pkg/haproxy.inc @@ -1460,6 +1460,12 @@ function haproxy_writeconf($configpath) { $a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['item']; $a_resolvers = &$config['installedpackages']['haproxy']['dns_resolvers']['item']; $a_files = &$config['installedpackages']['haproxy']['files']['item']; + if (!is_array($a_mailers)) { + $a_mailers = array(); + } + if (!is_array($a_resolvers)) { + $a_resolvers = array(); + } $fd = fopen($configfile, "w"); if (is_array($a_global)) { diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 3fa52bb8..c5c67095 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -171,7 +171,7 @@ http://haproxy.1wt.eu/ Services - 0.32 + 0.33 Release 2.2 https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml @@ -179,7 +179,7 @@ sbin/haproxy:net/haproxy net haproxy - haproxy-devel-1.6-dev4-##ARCH##.pbi + haproxy-1.6.2-##ARCH##.pbi security/openssl lang/lua53 haproxy diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 5a41698d..f8285354 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -190,7 +190,7 @@ Supports ACLs for smart backend switching.]]> http://haproxy.1wt.eu/ Services - 1.5.3 pkg v 0.32 + 1.5.3 pkg v 0.33 Release 2.1 https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index f5322dbb..2f6e6e36 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -177,7 +177,7 @@ Supports ACLs for smart backend switching.]]> http://haproxy.1wt.eu/ Services - 1.5.3 pkg v 0.32 + 1.5.3 pkg v 0.33 Release 2.1 https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml -- cgit v1.2.3 From 87204854b73e82459c7ae09b8d66a5db09ac9661 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 5 Nov 2015 19:33:20 +0100 Subject: haproxy-devel, set binary reference to 1.6.2_1 --- config/haproxy-devel/pkg/haproxy.inc | 9 ++++++++- pkg_config.10.xml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index 714b041c..3d614fe0 100644 --- a/config/haproxy-devel/pkg/haproxy.inc +++ b/config/haproxy-devel/pkg/haproxy.inc @@ -766,7 +766,8 @@ function write_backend($configpath, $fd, $name, $pool, $backendsettings) { $backend_mode = $frontendtype; } fwrite ($fd, "\tmode\t\t\t" . $backend_mode . "\n"); - + fwrite ($fd, "\tlog\t\t\tglobal\n"); + $use_haproxyresolvers = false; if (haproxy_version() >= '1.6') { $use_mailers = is_array($a_mailers) && count($a_mailers) > 0; @@ -1460,6 +1461,12 @@ function haproxy_writeconf($configpath) { $a_mailers = &$config['installedpackages']['haproxy']['email_mailers']['item']; $a_resolvers = &$config['installedpackages']['haproxy']['dns_resolvers']['item']; $a_files = &$config['installedpackages']['haproxy']['files']['item']; + if (!is_array($a_frontends)) { + $a_frontends = array(); + } + if (!is_array($a_backends)) { + $a_backends = array(); + } if (!is_array($a_mailers)) { $a_mailers = array(); } diff --git a/pkg_config.10.xml b/pkg_config.10.xml index c5c67095..f9212e66 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -179,7 +179,7 @@ sbin/haproxy:net/haproxy net haproxy - haproxy-1.6.2-##ARCH##.pbi + haproxy-1.6.2_1-##ARCH##.pbi security/openssl lang/lua53 haproxy -- cgit v1.2.3 From 64a929ef5032289d9485f9c4c3f8c038ce2ac528 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 5 Nov 2015 19:37:23 +0100 Subject: haproxy-devel, append duplicate name to with -copy --- config/haproxy-devel/www/haproxy_listeners_edit.php | 1 + config/haproxy-devel/www/haproxy_pool_edit.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/haproxy-devel/www/haproxy_listeners_edit.php b/config/haproxy-devel/www/haproxy_listeners_edit.php index 9d2b0b05..8e6c1c3d 100644 --- a/config/haproxy-devel/www/haproxy_listeners_edit.php +++ b/config/haproxy-devel/www/haproxy_listeners_edit.php @@ -283,6 +283,7 @@ if (isset($id) && $a_backend[$id]) { if (isset($_GET['dup'])) { unset($id); + $pconfig['name'] .= "-copy"; if ($pconfig['secondary'] != 'yes') $pconfig['primary_frontend'] = $pconfig['name']; } diff --git a/config/haproxy-devel/www/haproxy_pool_edit.php b/config/haproxy-devel/www/haproxy_pool_edit.php index 71da9732..2b4787f3 100644 --- a/config/haproxy-devel/www/haproxy_pool_edit.php +++ b/config/haproxy-devel/www/haproxy_pool_edit.php @@ -323,9 +323,10 @@ if (isset($id) && $a_pools[$id]) { } } -if (isset($_GET['dup'])) +if (isset($_GET['dup'])) { unset($id); - + $pconfig['name'] .= "-copy"; +} $changedesc = "Services: HAProxy: Backend server pool: "; $changecount = 0; -- cgit v1.2.3 From d70d488f5d9427dc97b7be5a00f59f26315230c4 Mon Sep 17 00:00:00 2001 From: PiBa-NL Date: Thu, 5 Nov 2015 19:44:30 +0100 Subject: haproxy-devel, change package description to '1.6 stable' --- pkg_config.10.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index f9212e66..b9a116ca 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -166,7 +166,7 @@ The Reliable, High Performance TCP/HTTP(S) Load Balancer.
This package implements the TCP, HTTP and HTTPS balancing features from haproxy.
Supports ACLs for smart backend switching.
- As of pkg v0.27 switched to using 1.6dev releases. If you need stable, switch to haproxy-1_5 package. + As of pkg v0.33 switched to using 1.6 stable releases. ]]> http://haproxy.1wt.eu/ -- cgit v1.2.3