diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-04-10 10:29:16 +0000 |
|---|---|---|
| committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-04-10 10:29:16 +0000 |
| commit | c6f23303112e68d34bc4d8efd49217629d86296b (patch) | |
| tree | 8ae9d5806c22892d4c088bec369157494c32ff26 | |
| parent | f5d40cf3cf8b29a289da31bb3f0368fcfaeae3c9 (diff) | |
| download | vyos-1x-c6f23303112e68d34bc4d8efd49217629d86296b.tar.gz vyos-1x-c6f23303112e68d34bc4d8efd49217629d86296b.zip | |
T5148: Fix OpenVPN plugin dir variable
Jinja2 template uses {{ plugin_dir }} that it gets from the
interface-openvpn.py variable 'plugin_dir' but the correct var
should be as part of 'openvpn' dictionary i.e. openvpn['plugin_dir']
| -rwxr-xr-x | src/conf_mode/interfaces-openvpn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py index 13d84a6fe..6f227b0d1 100755 --- a/src/conf_mode/interfaces-openvpn.py +++ b/src/conf_mode/interfaces-openvpn.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2019-2022 VyOS maintainers and contributors +# Copyright (C) 2019-2023 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -597,7 +597,7 @@ def generate_pki_files(openvpn): def generate(openvpn): interface = openvpn['ifname'] directory = os.path.dirname(cfg_file.format(**openvpn)) - plugin_dir = '/usr/lib/openvpn' + openvpn['plugin_dir'] = '/usr/lib/openvpn' # create base config directory on demand makedir(directory, user, group) # enforce proper permissions on /run/openvpn |