diff options
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | etc/inc/upgrade_config.inc | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index a18e1bb..fcb9026 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -89,7 +89,7 @@ $g = array( "disablehelpmenu" => false, "disablehelpicon" => false, "debug" => false, - "latest_config" => "7.2", + "latest_config" => "7.3", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "105", "minimum_ram_warning_text" => "128 MB", diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index f21146d..f4f8bb6 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -857,7 +857,7 @@ function upgrade_045_to_046() { $pool['type'] = 'server'; $pool['behaviour'] = 'balance'; $pool['name'] = "{$vs_a[$i]['name']}-sitedown"; - $pool['desc'] = "Sitedown pool for VS: {$vs_a[$i]['name']}"; + $pool['descr'] = "Sitedown pool for VS: {$vs_a[$i]['name']}"; $pool['port'] = $pools[$vs_a[$i]['pool']]['port']; $pool['servers'] = array(); $pool['servers'][] = $vs_a[$i]['sitedown']; @@ -1649,7 +1649,7 @@ function upgrade_053_to_054() { foreach($lbpool_arr as $lbpool) { if($lbpool['type'] == "gateway") { $gateway_group['name'] = $lbpool['name']; - $gateway_group['descr'] = $lbpool['desc']; + $gateway_group['descr'] = $lbpool['descr']; $gateway_group['trigger'] = "down"; $gateway_group['item'] = array(); $i = 0; @@ -2225,4 +2225,24 @@ function upgrade_071_to_072() { } } } + +function desc_to_descr(& $section) { + if (is_array($section)) { + foreach($section as & $item) { + if (!empty($item['desc'])) { + $item['descr'] = $item['desc']; + unset($item['desc']); + } + } + } +} + +function upgrade_072_to_073() { + global $config; + desc_to_descr($config['load_balancer']['monitor_type']); + desc_to_descr($config['load_balancer']['lbpool']); + desc_to_descr($config['load_balancer']['lbaction']); + desc_to_descr($config['load_balancer']['lbprotocol']); + desc_to_descr($config['load_balancer']['virtual_server']); +} ?> |
