diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-18 13:47:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-18 13:47:24 +0200 |
| commit | 8d8fea6428cf7687757f14592cc345bf0804b993 (patch) | |
| tree | 7f07a30f8041e73188caaa66e8f08de8174a516e | |
| parent | e2a5057b1358b5d8fa7afcd4398d0b264236172c (diff) | |
| parent | 2c390850e53c89b3527ab05481300cd470461043 (diff) | |
| download | vyos-1x-8d8fea6428cf7687757f14592cc345bf0804b993.tar.gz vyos-1x-8d8fea6428cf7687757f14592cc345bf0804b993.zip | |
Merge pull request #355 from DmitriyEshenko/fix-ipsec-sts-l2tp
ipsec: T2317: Fix typo with delimiter
| -rwxr-xr-x | src/conf_mode/ipsec-settings.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/ipsec-settings.py b/src/conf_mode/ipsec-settings.py index e76916dbd..da19dcb26 100755 --- a/src/conf_mode/ipsec-settings.py +++ b/src/conf_mode/ipsec-settings.py @@ -100,7 +100,7 @@ def write_ipsec_secrets(c): if c.get("ipsec_l2tp_auth_mode") == "pre-shared-secret": secret_txt = "{0}\n{1} %any : PSK \"{2}\"\n{3}\n".format(delim_ipsec_l2tp_begin, c['outside_addr'], c['ipsec_l2tp_secret'], delim_ipsec_l2tp_end) elif data.get("ipsec_l2tp_auth_mode") == "x509": - secret_txt = "{0}\n: RSA {1}\n{2}\n".format(delim_ipsec_l2tp_begin, c['server_key_file_copied'], delim_ipsec_l2tp_begin) + secret_txt = "{0}\n: RSA {1}\n{2}\n".format(delim_ipsec_l2tp_begin, c['server_key_file_copied'], delim_ipsec_l2tp_end) old_umask = os.umask(0o077) with open(ipsec_secrets_file, 'a+') as f: @@ -108,7 +108,7 @@ def write_ipsec_secrets(c): os.umask(old_umask) def write_ipsec_conf(c): - ipsec_confg_txt = "{0}\ninclude {1}\n{2}\n".format(delim_ipsec_l2tp_begin, ipsec_ra_conn_file, delim_ipsec_l2tp_begin) + ipsec_confg_txt = "{0}\ninclude {1}\n{2}\n".format(delim_ipsec_l2tp_begin, ipsec_ra_conn_file, delim_ipsec_l2tp_end) old_umask = os.umask(0o077) with open(ipsec_conf_file, 'a+') as f: |