diff options
| author | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-10-03 14:42:46 +0200 |
|---|---|---|
| committer | Marcus Hoff <marcus.hoff@ring2.dk> | 2020-10-03 14:42:46 +0200 |
| commit | a2f66afca8ff4ef483b39a62c2a9ac9458cd6e08 (patch) | |
| tree | 73fa9ee92d12c86f70f2dc5aeb6fb749859f817c | |
| parent | 000c18e7ccaf8a7e265b078211837c6fcf3e8179 (diff) | |
| download | vyos-1x-a2f66afca8ff4ef483b39a62c2a9ac9458cd6e08.tar.gz vyos-1x-a2f66afca8ff4ef483b39a62c2a9ac9458cd6e08.zip | |
openvpn: T2957:
Status file directory for show command was wrong, resulting in no
output.
Now points to '/var/run/openvpn/{}.status'
| -rw-r--r-- | .github/pull.yml | 5 | ||||
| -rwxr-xr-x | src/op_mode/show_openvpn.py | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/.github/pull.yml b/.github/pull.yml deleted file mode 100644 index 8238ed5df..000000000 --- a/.github/pull.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "1" -rules: - - base: current - upstream: vyos:current # change `wei` to the owner of upstream repo - mergeMethod: hardreset diff --git a/src/op_mode/show_openvpn.py b/src/op_mode/show_openvpn.py index 32918ddce..1da4c7ecb 100755 --- a/src/op_mode/show_openvpn.py +++ b/src/op_mode/show_openvpn.py @@ -51,7 +51,7 @@ def bytes2HR(size): return output def get_status(mode, interface): - status_file = '/opt/vyatta/etc/openvpn/status/{}.status'.format(interface) + status_file = '/var/run/openvpn/{}.status'.format(interface) # this is an empirical value - I assume we have no more then 999999 # current OpenVPN connections routing_table_line = 999999 @@ -175,4 +175,3 @@ if __name__ == '__main__': tmpl = jinja2.Template(outp_tmpl) print(tmpl.render(data)) - |