diff options
| author | PiBa-NL <pba_2k3@yahoo.com> | 2012-10-01 14:38:03 +0200 |
|---|---|---|
| committer | PiBa-NL <pba_2k3@yahoo.com> | 2012-10-01 14:38:03 +0200 |
| commit | d8cdfd3e34fd57bfde7061620007a712321c4d12 (patch) | |
| tree | b41e4bbd5ba58ca0595058725856554f2b768379 /etc/inc/upgrade_config.inc | |
| parent | 90763c7fabf9dbcba50dcb15748c7c6d5dc148ec (diff) | |
| parent | 19d61d2731c1fb0baf877632e8e482bf3ff57bdd (diff) | |
| download | pfsense-d8cdfd3e34fd57bfde7061620007a712321c4d12.zip pfsense-d8cdfd3e34fd57bfde7061620007a712321c4d12.tar.gz | |
Merge branch 'master' of git://github.com/bsdperimeter/pfsense
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']); + } + } + } +} ?> |
