diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2021-07-05 21:58:43 +0200 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2021-07-06 09:12:48 +0200 |
| commit | a5cd877a0a4a43644a6d91e6b95fe938b9b2726b (patch) | |
| tree | f01f18b80e367234336e6281ffffbe253408addd /src/conf_mode/ipsec-settings.py | |
| parent | 0b93fce06526a2826c19adcbb25874e51cccf68e (diff) | |
| download | vyos-1x-a5cd877a0a4a43644a6d91e6b95fe938b9b2726b.tar.gz vyos-1x-a5cd877a0a4a43644a6d91e6b95fe938b9b2726b.zip | |
ipsec: T2816: Migrate ipsec-settings.xml.in and charon.conf to vpn_ipsec.py
Also adds check for the charon socket instead of an arbitrary sleep()
Diffstat (limited to 'src/conf_mode/ipsec-settings.py')
| -rwxr-xr-x | src/conf_mode/ipsec-settings.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/conf_mode/ipsec-settings.py b/src/conf_mode/ipsec-settings.py index a65e8b567..a373f821f 100755 --- a/src/conf_mode/ipsec-settings.py +++ b/src/conf_mode/ipsec-settings.py @@ -29,7 +29,6 @@ from vyos import airbag airbag.enable() ra_conn_name = "remote-access" -charon_conf_file = "/etc/strongswan.d/charon.conf" ipsec_secrets_file = "/etc/ipsec.secrets" ipsec_ra_conn_dir = "/etc/ipsec.d/tunnels/" ipsec_ra_conn_file = ipsec_ra_conn_dir + ra_conn_name @@ -46,10 +45,6 @@ def get_config(config=None): config = config else: config = Config() - data = {"install_routes": "yes"} - - if config.exists("vpn ipsec options disable-route-autoinstall"): - data["install_routes"] = "no" if config.exists("vpn ipsec ipsec-interfaces interface"): data["ipsec_interfaces"] = config.return_values("vpn ipsec ipsec-interfaces interface") @@ -170,8 +165,6 @@ def verify(data): raise ConfigError("L2TP VPN configuration error: \"vpn ipsec ipsec-interfaces\" must be specified.") def generate(data): - render(charon_conf_file, 'ipsec/charon.tmpl', data) - if data["ipsec_l2tp"]: remove_confs(delim_ipsec_l2tp_begin, delim_ipsec_l2tp_end, ipsec_secrets_file) # old_umask = os.umask(0o077) |