From a457c9d21f94db233e90268703f8bc97a1ab64ec Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 12 Apr 2020 10:59:03 +0200 Subject: openvpn: T2273: migrate volatile data to /run/openvpn --- data/templates/openvpn/server.conf.tmpl | 2 -- src/etc/systemd/system/openvpn@.service.d/override.conf | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl index 656dc2afb..340ead269 100644 --- a/data/templates/openvpn/server.conf.tmpl +++ b/data/templates/openvpn/server.conf.tmpl @@ -9,8 +9,6 @@ {% endif -%} verb 3 -status /opt/vyatta/etc/openvpn/status/{{ intf }}.status 30 -writepid /run/openvpn/{{ intf }}.pid user {{ uid }} group {{ gid }} diff --git a/src/etc/systemd/system/openvpn@.service.d/override.conf b/src/etc/systemd/system/openvpn@.service.d/override.conf index 8f1710e79..7946484a3 100644 --- a/src/etc/systemd/system/openvpn@.service.d/override.conf +++ b/src/etc/systemd/system/openvpn@.service.d/override.conf @@ -6,4 +6,4 @@ After=vyos-router.service WorkingDirectory= WorkingDirectory=/run/openvpn ExecStart= -ExecStart=/usr/sbin/openvpn --daemon openvpn-%i --config %i.conf +ExecStart=/usr/sbin/openvpn --daemon openvpn-%i --config %i.conf --status %i.status 30 --writepid %i.pid -- cgit v1.2.3