Revision d9901ff4
Added by Chris Buechler over 9 years ago
| src/etc/inc/upgrade_config.inc | ||
|---|---|---|
| 4455 | 4455 |
global $config; |
| 4456 | 4456 |
|
| 4457 | 4457 |
foreach ($config['virtualip']['vip'] as $idx => $vip) {
|
| 4458 |
if ($vip['mode'] != "ipalias") |
|
| 4458 |
if ($vip['mode'] != "ipalias") {
|
|
| 4459 | 4459 |
continue; |
| 4460 |
if ($ipalias == $vip['subnet']) |
|
| 4460 |
} |
|
| 4461 |
if ($ipalias == $vip['subnet']) {
|
|
| 4461 | 4462 |
return ("_vip{$vip['uniqid']}");
|
| 4463 |
} |
|
| 4462 | 4464 |
} |
| 4463 | 4465 |
|
| 4464 | 4466 |
return ($ipalias); |
| ... | ... | |
| 4468 | 4470 |
global $config; |
| 4469 | 4471 |
|
| 4470 | 4472 |
foreach ($config['virtualip']['vip'] as $idx => $vip) {
|
| 4471 |
if ($vip['mode'] != "carp") |
|
| 4473 |
if ($vip['mode'] != "carp") {
|
|
| 4472 | 4474 |
continue; |
| 4473 |
if ($carp == "{$vip['interface']}_vip{$vip['vhid']}")
|
|
| 4475 |
} |
|
| 4476 |
if ($carp == "{$vip['interface']}_vip{$vip['vhid']}") {
|
|
| 4474 | 4477 |
return ("_vip{$vip['uniqid']}");
|
| 4478 |
} |
|
| 4475 | 4479 |
} |
| 4476 | 4480 |
|
| 4477 | 4481 |
return ($carp); |
| ... | ... | |
| 4493 | 4497 |
/* Convert IPsec phase 1 entries. */ |
| 4494 | 4498 |
if (is_array($config['ipsec']['phase1'])) {
|
| 4495 | 4499 |
foreach ($config['ipsec']['phase1'] as $idx => $ph1ent) {
|
| 4496 |
if (is_ipaddr($ph1ent['interface']) || is_ipaddrv6($ph1ent['interface'])) |
|
| 4500 |
if (is_ipaddr($ph1ent['interface']) || is_ipaddrv6($ph1ent['interface'])) {
|
|
| 4497 | 4501 |
$config['ipsec']['phase1'][$idx]['interface'] = get_vip_from_ip_alias($ph1ent['interface']); |
| 4498 |
else if (strpos($ph1ent['interface'], "_vip"))
|
|
| 4502 |
} else if (strpos($ph1ent['interface'], "_vip")) {
|
|
| 4499 | 4503 |
$config['ipsec']['phase1'][$idx]['interface'] = get_vip_from_oldcarp($ph1ent['interface']); |
| 4504 |
} |
|
| 4500 | 4505 |
} |
| 4501 | 4506 |
} |
| 4502 | 4507 |
|
| 4503 | 4508 |
/* Convert openvpn. */ |
| 4504 | 4509 |
if (is_array($config['openvpn']['openvpn-server'])) {
|
| 4505 | 4510 |
foreach ($config['openvpn']['openvpn-server'] as $idx => $ovpn) {
|
| 4506 |
if (empty($ovpn['interface'])) |
|
| 4511 |
if (empty($ovpn['interface'])) {
|
|
| 4507 | 4512 |
continue; |
| 4508 |
if (is_ipaddr($ovpn['interface']) || is_ipaddrv6($ovpn['interface'])) |
|
| 4513 |
} |
|
| 4514 |
if (is_ipaddr($ovpn['interface']) || is_ipaddrv6($ovpn['interface'])) {
|
|
| 4509 | 4515 |
$config['openvpn']['openvpn-server'][$idx]['interface'] = get_vip_from_ip_alias($ovpn['interface']); |
| 4510 |
else if (strpos($ovpn['interface'], "_vip"))
|
|
| 4516 |
} else if (strpos($ovpn['interface'], "_vip")) {
|
|
| 4511 | 4517 |
$config['openvpn']['openvpn-server'][$idx]['interface'] = get_vip_from_oldcarp($ovpn['interface']); |
| 4518 |
} |
|
| 4512 | 4519 |
} |
| 4513 | 4520 |
} |
| 4514 | 4521 |
if (is_array($config['openvpn']['openvpn-client'])) {
|
| 4515 | 4522 |
foreach ($config['openvpn']['openvpn-client'] as $idx => $ovpn) {
|
| 4516 |
if (empty($ovpn['interface'])) |
|
| 4523 |
if (empty($ovpn['interface'])) {
|
|
| 4517 | 4524 |
continue; |
| 4518 |
if (is_ipaddr($ovpn['interface']) || is_ipaddrv6($ovpn['interface'])) |
|
| 4525 |
} |
|
| 4526 |
if (is_ipaddr($ovpn['interface']) || is_ipaddrv6($ovpn['interface'])) {
|
|
| 4519 | 4527 |
$config['openvpn']['openvpn-client'][$idx]['interface'] = get_vip_from_ip_alias($ovpn['interface']); |
| 4520 |
else if (strpos($ovpn['interface'], "_vip"))
|
|
| 4528 |
} else if (strpos($ovpn['interface'], "_vip")) {
|
|
| 4521 | 4529 |
$config['openvpn']['openvpn-client'][$idx]['interface'] = get_vip_from_oldcarp($ovpn['interface']); |
| 4530 |
} |
|
| 4522 | 4531 |
} |
| 4523 | 4532 |
} |
| 4524 | 4533 |
|
| ... | ... | |
| 4527 | 4536 |
$active_ifs = explode(",", $config['unbound']['active_interface']);
|
| 4528 | 4537 |
$ifs = array(); |
| 4529 | 4538 |
foreach ($active_ifs as $if) {
|
| 4530 |
if (is_ipaddr($if) || is_ipaddrv6($if)) |
|
| 4539 |
if (is_ipaddr($if) || is_ipaddrv6($if)) {
|
|
| 4531 | 4540 |
$ifs[] = get_vip_from_ip_alias($if); |
| 4532 |
else if (strpos($if, "_vip"))
|
|
| 4541 |
} else if (strpos($if, "_vip")) {
|
|
| 4533 | 4542 |
$ifs[] = get_vip_from_oldcarp($if); |
| 4534 |
else
|
|
| 4543 |
} else {
|
|
| 4535 | 4544 |
$ifs[] = $if; |
| 4545 |
} |
|
| 4536 | 4546 |
} |
| 4537 | 4547 |
$config['unbound']['active_interface'] = implode(",", $ifs);
|
| 4538 | 4548 |
} |
| ... | ... | |
| 4542 | 4552 |
$active_ifs = explode(",", $config['dnsmasq']['interface']);
|
| 4543 | 4553 |
$ifs = array(); |
| 4544 | 4554 |
foreach ($active_ifs as $if) {
|
| 4545 |
if (is_ipaddr($if) || is_ipaddrv6($if)) |
|
| 4555 |
if (is_ipaddr($if) || is_ipaddrv6($if)) {
|
|
| 4546 | 4556 |
$ifs[] = get_vip_from_ip_alias($if); |
| 4547 |
else if (strpos($if, "_vip"))
|
|
| 4557 |
} else if (strpos($if, "_vip")) {
|
|
| 4548 | 4558 |
$ifs[] = get_vip_from_oldcarp($if); |
| 4549 |
else
|
|
| 4559 |
} else {
|
|
| 4550 | 4560 |
$ifs[] = $if; |
| 4561 |
} |
|
| 4551 | 4562 |
} |
| 4552 | 4563 |
$config['dnsmasq']['interface'] = implode(",", $ifs);
|
| 4553 | 4564 |
} |
Also available in: Unified diff
Fix style issues.