diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-14 21:38:57 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-04-14 21:50:57 +0200 |
| commit | f40a192635ec3445997c100134a638b1faece044 (patch) | |
| tree | c5e1044000c4be4a09cd389c10bd1ff8234ed1f9 | |
| parent | dbfc2add3434638628b43ecfa097fbd166c85db7 (diff) | |
| download | vyos-1x-f40a192635ec3445997c100134a638b1faece044.tar.gz vyos-1x-f40a192635ec3445997c100134a638b1faece044.zip | |
ethernet: T4353: fix Jinja2 linting errors
| -rw-r--r-- | data/templates/ethernet/wpa_supplicant.conf.j2 (renamed from data/templates/ethernet/wpa_supplicant.conf.tmpl) | 8 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-ethernet.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/ethernet/wpa_supplicant.conf.tmpl b/data/templates/ethernet/wpa_supplicant.conf.j2 index 74f0999c1..8f140f6cb 100644 --- a/data/templates/ethernet/wpa_supplicant.conf.tmpl +++ b/data/templates/ethernet/wpa_supplicant.conf.j2 @@ -31,13 +31,13 @@ ap_scan=0 fast_reauth=1 network={ -{% if eapol is vyos_defined %} -{% if eapol.ca_certificate is vyos_defined %} +{% if eapol is vyos_defined %} +{% if eapol.ca_certificate is vyos_defined %} ca_cert="/run/wpa_supplicant/{{ ifname }}_ca.pem" -{% endif %} +{% endif %} client_cert="/run/wpa_supplicant/{{ ifname }}_cert.pem" private_key="/run/wpa_supplicant/{{ ifname }}_cert.key" -{% endif %} +{% endif %} # list of accepted authenticated key management protocols key_mgmt=IEEE8021X diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py index 6aea7a80e..68f59893a 100755 --- a/src/conf_mode/interfaces-ethernet.py +++ b/src/conf_mode/interfaces-ethernet.py @@ -152,7 +152,7 @@ def verify(ethernet): def generate(ethernet): if 'eapol' in ethernet: render(wpa_suppl_conf.format(**ethernet), - 'ethernet/wpa_supplicant.conf.tmpl', ethernet) + 'ethernet/wpa_supplicant.conf.j2', ethernet) ifname = ethernet['ifname'] cert_file_path = os.path.join(cfg_dir, f'{ifname}_cert.pem') |