diff options
| author | jim-p <jimp@pfsense.org> | 2015-12-01 09:31:59 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2015-12-01 09:57:12 -0500 |
| commit | 9555dd3536698f9b0c1582a1212efff8532666ff (patch) | |
| tree | 4323bccc71aac7d2cf19273c61b06b493d88d593 /src | |
| parent | d5d5836c4f94e70f5f4ddf1df8ac8bb6e684202c (diff) | |
| download | pfsense-9555dd3536698f9b0c1582a1212efff8532666ff.zip pfsense-9555dd3536698f9b0c1582a1212efff8532666ff.tar.gz | |
Upgrade code to change topology_subnet checkbox to drop-down. Issue #5526
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index b7cc66b..893590d 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -71,7 +71,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "12.9", + "latest_config" => "13.0", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 512eb16..4605990 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4121,4 +4121,20 @@ function upgrade_128_to_129() { unset($config['ipsec']['enable']); } +function upgrade_129_to_130() { + global $config; + + /* Change OpenVPN topology_subnet checkbox into topology multi-select #5526 */ + if (is_array($config['openvpn']) && is_array($config['openvpn']['openvpn-server'])) { + foreach ($config['openvpn']['openvpn-server'] as & $serversettings) { + if (isset($serversettings['topology_subnet'])) { + unset($serversettings['topology_subnet']); + $serversettings['topology'] = "subnet"; + } else { + $serversettings['topology'] = "net30"; + } + } + } +} + ?> |
