diff options
author | jim-p <jimp@pfsense.org> | 2012-09-26 13:20:39 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2012-09-26 13:20:39 -0400 |
commit | 6e9b046e51f5728b8d8f0182b401476059040d1d (patch) | |
tree | 911aacf1b1623c1ca876b2d7f721b196f450e734 /etc/inc/upgrade_config.inc | |
parent | fd3515f2b78184125e0f16a4a991660003ff7cd0 (diff) | |
download | pfsense-6e9b046e51f5728b8d8f0182b401476059040d1d.zip pfsense-6e9b046e51f5728b8d8f0182b401476059040d1d.tar.gz |
Due to the DHCP pool tag needing to be an array, rename the old LB "pool" variable to something else so it's not interpreted as an array.
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index f7ae95d..4f66a8b 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -905,6 +905,8 @@ function upgrade_045_to_046() { $pool['behaviour'] = 'balance'; $pool['name'] = "{$vs_a[$i]['name']}-sitedown"; $pool['descr'] = sprintf(gettext("Sitedown pool for VS: %s"), $vs_a[$i]['name']); + if (is_array($vs_a[$i]['pool'])) + $vs_a[$i]['pool'] = $vs_a[$i]['pool'][0]; $pool['port'] = $pools[$vs_a[$i]['pool']]['port']; $pool['servers'] = array(); $pool['servers'][] = $vs_a[$i]['sitedown']; @@ -2930,4 +2932,19 @@ function upgrade_088_to_089() { } } } +function upgrade_089_to_090() { + global $config; + if (is_array($config['load_balancer']['virtual_server']) && count($config['load_balancer']['virtual_server'])) { + $vs_a = &$config['load_balancer']['virtual_server']; + for ($i = 0; isset($vs_a[$i]); $i++) { + if (is_array($vs_a[$i]['pool'])) { + $vs_a[$i]['poolname'] = $vs_a[$i]['pool'][0]; + unset($vs_a[$i]['pool']); + } elseif (!empty($vs_a[$i]['pool'])) { + $vs_a[$i]['poolname'] = $vs_a[$i]['pool']; + unset($vs_a[$i]['pool']); + } + } + } +} ?> |