diff options
| author | Kim Hagen <kim@sentrium.io> | 2021-10-07 08:44:00 -0500 |
|---|---|---|
| committer | Kim Hagen <kim@sentrium.io> | 2021-10-07 08:44:00 -0500 |
| commit | ba8630da96396f09c638fccdc9cfe6a3ee70fd58 (patch) | |
| tree | a4bedef0d677fa8179dd76c7c8d314476f3683cd /data | |
| parent | eb7f8904076e749e18c10b6374bf363dfa009c19 (diff) | |
| download | vyos-1x-ba8630da96396f09c638fccdc9cfe6a3ee70fd58.tar.gz vyos-1x-ba8630da96396f09c638fccdc9cfe6a3ee70fd58.zip | |
pull request fixes
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/openvpn/server.conf.tmpl | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl index 644eb805f..3104203ad 100644 --- a/data/templates/openvpn/server.conf.tmpl +++ b/data/templates/openvpn/server.conf.tmpl @@ -127,14 +127,10 @@ push "dhcp-option DNS6 {{ nameserver }}" {% if server.domain_name is defined and server.domain_name is not none %} push "dhcp-option DOMAIN {{ server.domain_name }}" {% endif %} -{% if server['2fa'] is defined and server['2fa'] is not none %} -{% if server['2fa']['totp'] is defined and server['2fa']['totp'] is not none %} -plugin "/usr/lib/openvpn/openvpn-otp.so" "otp_secrets=/config/auth/openvpn/{{ ifname }}-otp-secrets otp_slop= -{{- server['2fa']['totp']['slop']|default(180) }} totp_t0= -{{- server['2fa']['totp']['drift']|default(0) }} totp_step= -{{- server['2fa']['totp']['step']|default(30) }} totp_digits= -{{- server['2fa']['totp']['digits']|default(6)}} password_is_cr= -{%-if server['2fa']['totp']['challenge']|default('enable') == 'enable' %}1{% else %}0{% endif %}" +{% if server.mfa is defined and server.mfa is not none %} +{% if server.mfa.totp is defined and server.mfa.totp is not none %} +{% set totp_config = server.mfa.totp %} +plugin "{{ plugin_dir}}/openvpn-otp.so" "otp_secrets=/config/auth/openvpn/{{ ifname }}-otp-secrets {{ 'otp_slop=' ~ totp_config.slop }} {{ 'totp_t0=' ~ totp_config.drift }} {{ 'totp_step=' ~ totp_config.step }} {{ 'totp_digits=' ~ totp_config.digits }} password_is_cr={{ '1' if totp_config.challenge == 'enable' else '0' }}" {% endif %} {% endif %} {% endif %} |