summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-19 17:41:01 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-19 17:41:01 +0200
commit580dde963f38f6a626745a9438bf902090fe67a0 (patch)
tree2e0ab38521b60e2ae1fc65e5d1b7fd722d631091
parent2f63c5abc93fd54645b35658d2b34b3b7435c31b (diff)
downloadvyos-1x-580dde963f38f6a626745a9438bf902090fe67a0.tar.gz
vyos-1x-580dde963f38f6a626745a9438bf902090fe67a0.zip
openvpn: T2308: fix path to UNIX control socket
Bug introduced in commit b36e6e6 ("openvpn: T2273: migrate from SysVinit to systemd") as not all relevant configuration files have been re-rendered into /run/openvpn.
-rw-r--r--data/templates/openvpn/server.conf.tmpl2
-rw-r--r--op-mode-definitions/openvpn.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl
index 53fe8d400..396888c0f 100644
--- a/data/templates/openvpn/server.conf.tmpl
+++ b/data/templates/openvpn/server.conf.tmpl
@@ -98,7 +98,7 @@ ccd-exclusive
{%- endif %}
keepalive {{ ping_interval }} {{ ping_restart }}
-management /tmp/openvpn-mgmt-intf unix
+management /run/openvpn/openvpn-mgmt-intf unix
{% for route in server_push_route -%}
push "route {{ route }}"
diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml
index 53c0157c6..b9cb06dca 100644
--- a/op-mode-definitions/openvpn.xml
+++ b/op-mode-definitions/openvpn.xml
@@ -59,7 +59,7 @@
<script>sudo ${vyos_completion_dir}/list_openvpn_clients.py --all</script>
</completionHelp>
</properties>
- <command>echo kill $4 | socat - UNIX-CONNECT:/tmp/openvpn-mgmt-intf &gt; /dev/null</command>
+ <command>echo kill $4 | socat - UNIX-CONNECT:/run/openvpn/openvpn-mgmt-intf &gt; /dev/null</command>
</tagNode>
<tagNode name="interface">
<properties>