diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2015-11-05 19:33:20 +0100 |
|---|---|---|
| committer | PiBa-NL <pba_2k3@yahoo.com> | 2015-11-05 19:33:20 +0100 |
| commit | 87204854b73e82459c7ae09b8d66a5db09ac9661 (patch) | |
| tree | 1547fd780b5f7b2aea9821d96e378248c3490899 | |
| parent | d529f5eda199344e285f111d12d0115720677e1c (diff) | |
| download | pfsense-packages-87204854b73e82459c7ae09b8d66a5db09ac9661.tar.gz pfsense-packages-87204854b73e82459c7ae09b8d66a5db09ac9661.tar.bz2 pfsense-packages-87204854b73e82459c7ae09b8d66a5db09ac9661.zip | |
haproxy-devel, set binary reference to 1.6.2_1
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy.inc | 9 | ||||
| -rw-r--r-- | 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 @@ <run_depends>sbin/haproxy:net/haproxy</run_depends> <port_category>net</port_category> <conflicts>haproxy</conflicts> - <depends_on_package_pbi>haproxy-1.6.2-##ARCH##.pbi</depends_on_package_pbi> + <depends_on_package_pbi>haproxy-1.6.2_1-##ARCH##.pbi</depends_on_package_pbi> <build_pbi> <ports_before>security/openssl lang/lua53</ports_before> <custom_name>haproxy</custom_name> |