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

Proposed by Lucas Kanashiro
Status: Merged
Approved by: Lucas Kanashiro
Approved revision: cdb74ce975c7ab5538db774febbb884a3cf6b3c6
Merged at revision: cdb74ce975c7ab5538db774febbb884a3cf6b3c6
Proposed branch: ~lucaskanashiro/ubuntu/+source/openvpn:focal-drop-reload
Merge into: ubuntu/+source/openvpn:ubuntu/focal-devel
Diff against target: 46 lines (+6/-3)
3 files modified
debian/changelog (+6/-0)
debian/openvpn.service (+0/-1)
debian/openvpn@.service (+0/-2)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Ubuntu Server Developers Pending
Review via email: mp+384724@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

$ 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index dcf699a..4d28ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openvpn (2.4.7-1ubuntu2.20.04.1) focal; urgency=medium
2
3 * Drop reload support from systemd unit files (LP: #1868127)
4
5 -- Lucas Kanashiro <kanashiro@ubuntu.com> Wed, 27 May 2020 19:19:47 -0300
6
1openvpn (2.4.7-1ubuntu2) eoan; urgency=medium7openvpn (2.4.7-1ubuntu2) eoan; urgency=medium
28
3 * No-change upload with strops.h and sys/strops.h removed in glibc.9 * 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
9Type=oneshot9Type=oneshot
10RemainAfterExit=yes10RemainAfterExit=yes
11ExecStart=/bin/true11ExecStart=/bin/true
12ExecReload=/bin/true
13WorkingDirectory=/etc/openvpn12WorkingDirectory=/etc/openvpn
1413
15[Install]14[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 @@
1[Unit]1[Unit]
2Description=OpenVPN connection to %i2Description=OpenVPN connection to %i
3PartOf=openvpn.service3PartOf=openvpn.service
4ReloadPropagatedFrom=openvpn.service
5Before=systemd-user-sessions.service4Before=systemd-user-sessions.service
6After=network-online.target5After=network-online.target
7Wants=network-online.target6Wants=network-online.target
@@ -16,7 +15,6 @@ WorkingDirectory=/etc/openvpn
16ExecStart=/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.pid15ExecStart=/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
17PIDFile=/run/openvpn/%i.pid16PIDFile=/run/openvpn/%i.pid
18KillMode=process17KillMode=process
19ExecReload=/bin/kill -HUP $MAINPID
20CapabilityBoundingSet=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_WRITE18CapabilityBoundingSet=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
21LimitNPROC=10019LimitNPROC=100
22DeviceAllow=/dev/null rw20DeviceAllow=/dev/null rw

Subscribers

People subscribed via source and target branches