summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/pull.yml5
-rwxr-xr-xsrc/op_mode/show_openvpn.py3
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))
-