diff options
| author | jim-p <jimp@pfsense.org> | 2015-02-09 20:11:21 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2015-02-09 20:11:21 -0500 |
| commit | 7a051d65eba3b5b78911a55124e7985220916fb1 (patch) | |
| tree | c5d0429201ffff68092cbb5209b61633e938c7ab /config/haproxy-devel/pkg/haproxy_upgrade_config.inc | |
| parent | 55b1712ee8e24b0f70efea8badab6ab7c50bc2d5 (diff) | |
| parent | 5f8d58ffef12096558a0fb7a8b6a03f83a50bb06 (diff) | |
| download | pfsense-packages-7a051d65eba3b5b78911a55124e7985220916fb1.tar.gz pfsense-packages-7a051d65eba3b5b78911a55124e7985220916fb1.tar.bz2 pfsense-packages-7a051d65eba3b5b78911a55124e7985220916fb1.zip | |
Merge pull request #815 from PiBa-NL/haproxy-devel_0_13
Diffstat (limited to 'config/haproxy-devel/pkg/haproxy_upgrade_config.inc')
| -rw-r--r-- | config/haproxy-devel/pkg/haproxy_upgrade_config.inc | 14 |
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) { |