diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-05 16:50:23 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-05 16:50:23 -0200 |
| commit | a616f7a7ce42c8c5bcf30fe2e6cad8f4d5403599 (patch) | |
| tree | eca53143c232e667176fe6434438261f530efe20 /config/haproxy-devel/pkg | |
| parent | ba5064d40f6691089af307ecdb54b0b41453852e (diff) | |
| parent | d70d488f5d9427dc97b7be5a00f59f26315230c4 (diff) | |
| download | pfsense-packages-RELENG_2_2_5.tar.gz pfsense-packages-RELENG_2_2_5.tar.bz2 pfsense-packages-RELENG_2_2_5.zip | |
Merge pull request #1135 from PiBa-NL/haproxy_pkg0.32RELENG_2_2_5
Diffstat (limited to 'config/haproxy-devel/pkg')
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy.inc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/config/haproxy-devel/pkg/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc index 638ece28..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,18 @@ 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(); + } + if (!is_array($a_resolvers)) { + $a_resolvers = array(); + } $fd = fopen($configfile, "w"); if (is_array($a_global)) { |