diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-04-08 19:49:42 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-04-08 19:49:42 +0000 |
| commit | 1bd18fbac7eba41c02b707a76e321257b74f8f8f (patch) | |
| tree | fe7069bcb0016e04641fb3015aba47713cb6e640 /etc/inc/config.inc | |
| parent | 70c308e9067a4b5a8b5d2719c6ab2b2c89c3d3d6 (diff) | |
| download | pfsense-1bd18fbac7eba41c02b707a76e321257b74f8f8f.zip pfsense-1bd18fbac7eba41c02b707a76e321257b74f8f8f.tar.gz | |
Make recently commited code readable.
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index aa78945..503ce97 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1139,17 +1139,16 @@ function convert_config() { } /* Convert 4.1 -> 4.2 */ - if ($config['version'] <= 4.1) { + if ($config['version'] <= 4.1) { if (isset($config['shaper'])) - unset($config['shaper']); - if (isset($config['ezshaper'])) - unset($config['ezshaper']); - - $config['version'] = "4.2"; + unset($config['shaper']); + if (isset($config['ezshaper'])) + unset($config['ezshaper']); + $config['version'] = "4.2"; } /* Convert 4.2 -> 4.3 */ - if ($config['version'] <= 4.2) { + if ($config['version'] <= 4.2) { /* migrate old interface gateway to the new gateways config */ $old_gateways = array(); $gateways = array(); @@ -1171,8 +1170,8 @@ function convert_config() { $config['version'] = "4.3"; } - /* Convert 4.3 -> 4.4 */ - if ($config['version'] <= 4.3) { + /* Convert 4.3 -> 4.4 */ + if ($config['version'] <= 4.3) { if (isset($config['installedpackages']['openvpnserver']['config'])) { $ocfg =& $config['installedpackages']['openvpnserver']['config']; if (!isset($config['openvpn'])) @@ -1185,38 +1184,37 @@ function convert_config() { $ncfg["converted{$id}"]['shared.key'] = $cfg['shared_key']; $ncfg["converted{$id}"]['existing'] = "yes"; $ncfg["converted{$id}"]['auth_method'] = "shared_key"; - $ocfg['cipher'] = "converted{$id}"; + $ocfg['cipher'] = "converted{$id}"; unset($ocfg['shared_key']); } else { if (isset($ocfg['ca_cert'])) { $ncfg["converted{$id}"]['ca.crt'] = $ocfg['ca_cert']; unset($ocfg['ca_cert']); } - if (isset($ocfg['server_cert'])) { - $ncfg["converted{$id}"]['server.crt'] = $ocfg['server_cert']; - unset($ocfg['server_cert']); - } - if (isset($ocfg['server_key'])) { - $ncfg["converted{$id}"]['server.key'] = $ocfg['server_key']; - unset($ocfg['ca_cert']); - } - if (isset($ocfg['dh_params'])) { - $ncfg["converted{$id}"]['dh_params.dh'] = $ocfg['dh_params']; - unset($ocfg['dh_params']); - } - if (isset($ocfg['crl'])) { - $ncfg["converted{$id}"]['crl'] = $ocfg['crl']; - unset($ocfg['crl']); - } + if (isset($ocfg['server_cert'])) { + $ncfg["converted{$id}"]['server.crt'] = $ocfg['server_cert']; + unset($ocfg['server_cert']); + } + if (isset($ocfg['server_key'])) { + $ncfg["converted{$id}"]['server.key'] = $ocfg['server_key']; + unset($ocfg['ca_cert']); + } + if (isset($ocfg['dh_params'])) { + $ncfg["converted{$id}"]['dh_params.dh'] = $ocfg['dh_params']; + unset($ocfg['dh_params']); + } + if (isset($ocfg['crl'])) { + $ncfg["converted{$id}"]['crl'] = $ocfg['crl']; + unset($ocfg['crl']); + } $ncfg["converted{$id}"]['existing'] = "yes"; $ocfg['cipher'] = "converted{$id}"; } - + } } - $config['version'] = "4.4"; - } - + $config['version'] = "4.4"; + } if ($prev_version != $config['version']) write_config("Upgraded config version level from {$prev_version} to {$config['version']}"); @@ -2094,4 +2092,4 @@ function set_device_perms() { if($g['booting']) echo "."; $config = parse_config(); -?> +?>
\ No newline at end of file |
