summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/upgrade_config.inc10
1 files changed, 10 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index f2175ff..10c3ff9 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2547,9 +2547,11 @@ function upgrade_066_to_067() {
global $config;
if (isset($config['system']['ca'])) {
$config['ca'] = $config['system']['ca'];
+ unset($config['system']['ca']);
}
if (isset($config['system']['cert'])) {
$config['cert'] = $config['system']['cert'];
+ unset($config['system']['cert']);
}
}
@@ -3753,6 +3755,14 @@ function upgrade_116_to_117() {
function upgrade_117_to_118() {
global $config;
+ // Unset any old CA and Cert in the system section that might still be there from when upgrade_066_to_067 did not unset them.
+ if (isset($config['system']['ca'])) {
+ unset($config['system']['ca']);
+ }
+ if (isset($config['system']['cert'])) {
+ unset($config['system']['cert']);
+ }
+
if (!isset($config['ipsec']['phase1'])) {
return;
}
OpenPOWER on IntegriCloud