summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-01-20 12:18:33 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-01-20 12:18:45 +0100
commit12e09aa53c44a997888b28533f44a3cc887cd36e (patch)
treeac78abae8bf56a30cbe9631d7413e9e0df671128 /debian
parent9364f88c1602062e10fec008b7170d90a758cb2e (diff)
Fix #811010
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/openvpn@.service4
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 <agi@inittab.org> 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