From 12e09aa53c44a997888b28533f44a3cc887cd36e Mon Sep 17 00:00:00 2001 From: Alberto Gonzalez Iniesta Date: Wed, 20 Jan 2016 12:18:33 +0100 Subject: Fix #811010 --- debian/changelog | 2 ++ debian/openvpn@.service | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d98efd..ae87af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ openvpn (2.3.10-1) unstable; urgency=medium * New upstream release. Drop password_prompt_in_systemd.patch. Applied upstream. + * Unify pidfile path on systemd and sysV. (Closes: #811010) + Thanks Guillem Jover for noticing. -- Alberto Gonzalez Iniesta Wed, 20 Jan 2016 12:01:36 +0100 diff --git a/debian/openvpn@.service b/debian/openvpn@.service index b438168..1bb70b8 100644 --- a/debian/openvpn@.service +++ b/debian/openvpn@.service @@ -10,8 +10,8 @@ Documentation=https://community.openvpn.net/openvpn/wiki/HOWTO PrivateTmp=true KillMode=mixed Type=forking -ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn/%i.status 10 --cd /etc/openvpn --config /etc/openvpn/%i.conf --writepid /run/openvpn-%i.pid -PIDFile=/run/openvpn-%i.pid +ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn/%i.status 10 --cd /etc/openvpn --config /etc/openvpn/%i.conf --writepid /run/openvpn/%i.pid +PIDFile=/run/openvpn/%i.pid ExecReload=/bin/kill -HUP $MAINPID WorkingDirectory=/etc/openvpn ProtectSystem=yes -- cgit v1.2.3