Merge remote-tracking branch 'upstream/current' into current

2 files changed, 68 insertions, 20 deletions

diff --git a/src/migration-scripts/sstp/2-to-3 b/src/migration-scripts/sstp/2-to-3
new file mode 100755
index 000000000..51f4effed
--- /dev/null
+++ b/src/migration-scripts/sstp/2-to-3
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# - Rename SSTP ppp-settings node to ppp-options to make use of a common
+#   Jinja Template to render Accel-PPP services
+
+from vyos.configtree import ConfigTree
+from sys import argv
+from sys import exit
+
+if (len(argv) < 1):
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+config = ConfigTree(config_file)
+base_path = ['vpn', 'sstp']
+if not config.exists(base_path):
+    # Nothing to do
+    exit(0)
+else:
+    if config.exists(base_path + ['ppp-settings']):
+        config.rename(base_path + ['ppp-settings'], 'ppp-options')
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        exit(1)
diff --git a/src/migration-scripts/system/11-to-12 b/src/migration-scripts/system/11-to-12
index 1a0233c7d..9cddaa1a7 100755
--- a/src/migration-scripts/system/11-to-12
+++ b/src/migration-scripts/system/11-to-12
@@ -37,31 +37,32 @@ else:
     # Migrate "system login radius-server" tag node to new
     # "system login radius server" tag node and also rename the "secret" node to "key"
     #
-    for server in config.list_nodes(cfg_base + ['radius-server']):
-        base_server = cfg_base + ['radius-server', server]
-        # "key" node is mandatory
-        key = config.return_value(base_server + ['secret'])
-        config.set(cfg_base + ['radius', 'server', server, 'key'], value=key)
+    if config.exists(cfg_base + ['radius-server']):
+        for server in config.list_nodes(cfg_base + ['radius-server']):
+            base_server = cfg_base + ['radius-server', server]
+            # "key" node is mandatory
+            key = config.return_value(base_server + ['secret'])
+            config.set(cfg_base + ['radius', 'server', server, 'key'], value=key)
 
-        # "port" is optional
-        if config.exists(base_server + ['port']):
-            port = config.return_value(base_server + ['port'])
-            config.set(cfg_base + ['radius', 'server', server, 'port'], value=port)
+            # "port" is optional
+            if config.exists(base_server + ['port']):
+                port = config.return_value(base_server + ['port'])
+                config.set(cfg_base + ['radius', 'server', server, 'port'], value=port)
 
-        # "timeout is optional"
-        if config.exists(base_server + ['timeout']):
-            timeout = config.return_value(base_server + ['timeout'])
-            config.set(cfg_base + ['radius', 'server', server, 'timeout'], value=timeout)
+            # "timeout is optional"
+            if config.exists(base_server + ['timeout']):
+                timeout = config.return_value(base_server + ['timeout'])
+                config.set(cfg_base + ['radius', 'server', server, 'timeout'], value=timeout)
 
-        # format as tag node
-        config.set_tag(cfg_base + ['radius', 'server'])
+            # format as tag node
+            config.set_tag(cfg_base + ['radius', 'server'])
 
-        # delete old configuration node
-        config.delete(base_server)
+            # delete old configuration node
+            config.delete(base_server)
 
-    # delete top level tag node
-    if config.exists(cfg_base + ['radius-server']):
-        config.delete(cfg_base + ['radius-server'])
+        # delete top level tag node
+        if config.exists(cfg_base + ['radius-server']):
+            config.delete(cfg_base + ['radius-server'])
 
     try:
         with open(file_name, 'w') as f: