diff options
| -rw-r--r-- | interface-definitions/vpn_sstp.xml.in | 2 | ||||
| -rwxr-xr-x | src/conf_mode/vpn_sstp.py | 1 | ||||
| -rwxr-xr-x | src/migration-scripts/sstp/2-to-3 | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/interface-definitions/vpn_sstp.xml.in b/interface-definitions/vpn_sstp.xml.in index 3d28878bc..5ef503041 100644 --- a/interface-definitions/vpn_sstp.xml.in +++ b/interface-definitions/vpn_sstp.xml.in @@ -25,6 +25,7 @@ </node> </children> </node> + #include <include/interface-mtu-68-1500.xml.i> #include <include/accel-name-server.xml.i> <node name="network-settings"> <properties> @@ -41,7 +42,6 @@ </children> </node> #include <include/accel-client-ipv6-pool.xml.i> - #include <include/interface-mtu-68-1500.xml.i> </children> </node> <node name="ppp-options"> diff --git a/src/conf_mode/vpn_sstp.py b/src/conf_mode/vpn_sstp.py index a4a17de9c..15fcfcef3 100755 --- a/src/conf_mode/vpn_sstp.py +++ b/src/conf_mode/vpn_sstp.py @@ -270,7 +270,6 @@ def get_config(config=None): # # read in network settings - conf.set_level(base_path + ['network-settings']) if conf.exists(['mtu']): sstp['mtu'] = conf.return_value(['mtu']) diff --git a/src/migration-scripts/sstp/2-to-3 b/src/migration-scripts/sstp/2-to-3 index db705f5eb..dc96a2d30 100755 --- a/src/migration-scripts/sstp/2-to-3 +++ b/src/migration-scripts/sstp/2-to-3 @@ -44,6 +44,11 @@ else: config.copy(config_ns, base_path + ['name-server']) config.delete(config_ns) + config_mtu = base_path + ['network-settings', 'mtu'] + if config.exists(config_mtu): + config.copy(config_mtu, base_path + ['mtu']) + config.delete(config_mtu) + try: with open(file_name, 'w') as f: f.write(config.to_string()) |