From 68e82ecb26548ca51d9e9fd112c1ec422d0849f0 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Fri, 29 Jan 2016 17:59:20 -0600 Subject: OpenVPN server config upgrade already handled in 129_to_130. Ticket #5764 --- src/etc/inc/upgrade_config.inc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/etc') diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 9e356e3..d64a3c9 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4354,15 +4354,7 @@ function upgrade_139_to_140() { function upgrade_140_to_141() { global $config; - // retain OpenVPN's net30 default topology for upgraded configs so they still work - if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'])) { - foreach ($config['openvpn']['openvpn-server'] as $idx => $ovpnserver) { - if (!isset($ovpnserver['topology'])) { - $config['openvpn']['openvpn-server'][$idx]['topology'] = "net30"; - } - } - } - + // retain OpenVPN's net30 default topology for upgraded client configs so they still work if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-client'])) { foreach ($config['openvpn']['openvpn-client'] as $idx => $ovpnclient) { if (!isset($ovpnclient['topology'])) { -- cgit v1.1