Merge ~lucaskanashiro/ubuntu/+source/openvpn:focal-drop-reload into ubuntu/+source/openvpn:ubuntu/focal-devel

[Lucas Kanashiro]

Backport this patch to drop systemctl reload support from Focal:

https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/openvpn/+git/openvpn/+merge/384585

It is not working for a while and the restart does something similar.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-openvpn-drop-reload/+packages

[Christian Ehrhardt  (paelzer)]

We pre-discussed this, so you know I'm in favor of this approach.
+1

... I'm interested to see if the SRU team will have a different opinion on that

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

$ git push pkg upload/2.4.7-1ubuntu2.20.04.1
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.20 KiB | 205.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
remote: Checking connectivity: 10, done.
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openvpn
 * [new tag] upload/2.4.7-1ubuntu2.20.04.1 -> upload/2.4.7-1ubuntu2.20.04.1

$ dput ubuntu ../openvpn_2.4.7-1ubuntu2.20.04.1_source.changes
Checking signature on .changes
gpg: ../openvpn_2.4.7-1ubuntu2.20.04.1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../openvpn_2.4.7-1ubuntu2.20.04.1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openvpn_2.4.7-1ubuntu2.20.04.1.dsc: done.
  Uploading openvpn_2.4.7-1ubuntu2.20.04.1.debian.tar.xz: done.
  Uploading openvpn_2.4.7-1ubuntu2.20.04.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index dcf699a..4d28ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openvpn (2.4.7-1ubuntu2.20.04.1) focal; urgency=medium
+
+  * Drop reload support from systemd unit files (LP: #1868127)
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 27 May 2020 19:19:47 -0300
+
 openvpn (2.4.7-1ubuntu2) eoan; urgency=medium
 
   * No-change upload with strops.h and sys/strops.h removed in glibc.
diff --git a/debian/openvpn.service b/debian/openvpn.service
index 0075cc4..a4d1149 100644
--- a/debian/openvpn.service
+++ b/debian/openvpn.service
@@ -9,7 +9,6 @@ After=network.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/true
-ExecReload=/bin/true
 WorkingDirectory=/etc/openvpn
 
 [Install]
diff --git a/debian/openvpn@.service b/debian/openvpn@.service
index eb4be12..6d59b13 100644
--- a/debian/openvpn@.service
+++ b/debian/openvpn@.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=OpenVPN connection to %i
 PartOf=openvpn.service
-ReloadPropagatedFrom=openvpn.service
 Before=systemd-user-sessions.service
 After=network-online.target
 Wants=network-online.target
@@ -16,7 +15,6 @@ WorkingDirectory=/etc/openvpn
 ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn/%i.status 10 --cd /etc/openvpn --script-security 2 --config /etc/openvpn/%i.conf --writepid /run/openvpn/%i.pid
 PIDFile=/run/openvpn/%i.pid
 KillMode=process
-ExecReload=/bin/kill -HUP $MAINPID
 CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE CAP_AUDIT_WRITE
 LimitNPROC=100
 DeviceAllow=/dev/null rw