From 0377b8e40b0d3e424da11194e97659c5066c0a1d Mon Sep 17 00:00:00 2001 From: Marcus Hoff Date: Thu, 27 Aug 2020 14:01:41 +0200 Subject: Automatic PR from upstream --- .github/pull.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..8238ed5df --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,5 @@ +version: "1" +rules: + - base: current + upstream: vyos:current # change `wei` to the owner of upstream repo + mergeMethod: hardreset -- cgit v1.2.3 From a2f66afca8ff4ef483b39a62c2a9ac9458cd6e08 Mon Sep 17 00:00:00 2001 From: Marcus Hoff Date: Sat, 3 Oct 2020 14:42:46 +0200 Subject: openvpn: T2957: Status file directory for show command was wrong, resulting in no output. Now points to '/var/run/openvpn/{}.status' --- .github/pull.yml | 5 ----- src/op_mode/show_openvpn.py | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 .github/pull.yml 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)) - -- cgit v1.2.3