aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy-devel/pkg
diff options
context:
space:
mode:
authorPiBa-NL <pba_2k3@yahoo.com>2015-02-10 01:16:37 +0100
committerPiBa-NL <pba_2k3@yahoo.com>2015-02-10 01:16:37 +0100
commit5f8d58ffef12096558a0fb7a8b6a03f83a50bb06 (patch)
tree7de54171d4c10bde08870b72a2e01871854df263 /config/haproxy-devel/pkg
parent5a1a2539145d42ec2cbe15ab6530148d021d18c8 (diff)
downloadpfsense-packages-5f8d58ffef12096558a0fb7a8b6a03f83a50bb06.tar.gz
pfsense-packages-5f8d58ffef12096558a0fb7a8b6a03f83a50bb06.tar.bz2
pfsense-packages-5f8d58ffef12096558a0fb7a8b6a03f83a50bb06.zip
haproxy-devel,bump 0.19, fixed carp monitoring and added conversion from old carp-monitor config
Diffstat (limited to 'config/haproxy-devel/pkg')
-rw-r--r--config/haproxy-devel/pkg/haproxy_upgrade_config.inc14
1 files changed, 14 insertions, 0 deletions
diff --git a/config/haproxy-devel/pkg/haproxy_upgrade_config.inc b/config/haproxy-devel/pkg/haproxy_upgrade_config.inc
index 9c602457..c1c951df 100644
--- a/config/haproxy-devel/pkg/haproxy_upgrade_config.inc
+++ b/config/haproxy-devel/pkg/haproxy_upgrade_config.inc
@@ -179,6 +179,20 @@ function haproxy_upgrade_config() {
}
$configversion = "00.17";
}
+ if ($configversion < "00.19") {
+ update_output_window($static_output);
+ $carpint = $config['installedpackages']['haproxy']['carpdev'];
+ if (is_arrayset($config, 'virtualip', 'vip') && is_arrayset($config, 'installedpackages', 'haproxy')) {
+ foreach($config['virtualip']['vip'] as $carp) {
+ $carp_int = "{$carp['interface']}_vip{$carp['vhid']}";
+ if ($carp_int == $carpint) {
+ $config['installedpackages']['haproxy']['carpdev'] = $carp['subnet'];
+ break;
+ }
+ }
+ }
+ $configversion = "00.19";
+ }
$writeconfigupdate = $config['installedpackages']['haproxy']['configversion'] <> $configversion;
if ($writeconfigupdate) {