diff options
author | jim-p <jimp@pfsense.org> | 2010-10-19 12:39:01 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2010-10-19 12:39:01 -0400 |
commit | e988813dd2e6ab104660969c80395d1dc7877e3e (patch) | |
tree | f22632ef53eaca37f28d5f18ac2097c5aa30ee94 /etc/inc/upgrade_config.inc | |
parent | c4f5508496be6237334d1006cb029bb079747d45 (diff) | |
download | pfsense-e988813dd2e6ab104660969c80395d1dc7877e3e.zip pfsense-e988813dd2e6ab104660969c80395d1dc7877e3e.tar.gz |
desc to descr in Load Balancer config, so they gain CDATA protection and standardize field names. Ticket #320.
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 24 |
1 files changed, 22 insertions, 2 deletions
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']); +} ?> |