[Openvpn-devel] Update documentation references in systemd unit files

Message ID 20240308140346.4058419-1-frank@lichtenheld.com
State Accepted
Headers show
Series [Openvpn-devel] Update documentation references in systemd unit files | expand

Commit Message

Frank Lichtenheld March 8, 2024, 2:03 p.m. UTC
From: Christoph Schug <com+github@schug.net>

The systemd unit files for both client and server were referencing
outdated documentation as they were hard-coded to the OpenVPN 2.4.x
release branch.

Change-Id: Iee289aa5df9ee0e9a03c0dc562e45dd39836e794
Signed-off-by: Christoph Schug <com+github@schug.net>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 distro/systemd/Makefile.am                | 5 ++++-
 distro/systemd/openvpn-client@.service.in | 2 +-
 distro/systemd/openvpn-server@.service.in | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

Comments

Gert Doering March 8, 2024, 4:01 p.m. UTC | #1
Your patch has been applied to the master and release/2.6 branch.

commit f65c656ac034a99cca09557eeb9337e7c00a7e73 (master)
commit c6a61b84fdec825b0b4855d8cd12afa9ebeec43e (release/2.6)
Author: Christoph Schug
Date:   Fri Mar 8 15:03:46 2024 +0100

     Update documentation references in systemd unit files

     Signed-off-by: Christoph Schug <com+github@schug.net>
     Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
     Message-Id: <20240308140346.4058419-1-frank@lichtenheld.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28369.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/distro/systemd/Makefile.am b/distro/systemd/Makefile.am
index 7e8f4753..d1c903f2 100644
--- a/distro/systemd/Makefile.am
+++ b/distro/systemd/Makefile.am
@@ -9,7 +9,10 @@ 
 #
 
 %.service: %.service.in Makefile
-	$(AM_V_GEN)sed -e 's|\@sbindir\@|$(sbindir)|' \
+	$(AM_V_GEN)sed \
+		-e 's|\@OPENVPN_VERSION_MAJOR\@|$(OPENVPN_VERSION_MAJOR)|g' \
+		-e 's|\@OPENVPN_VERSION_MINOR\@|$(OPENVPN_VERSION_MINOR)|g' \
+		-e 's|\@sbindir\@|$(sbindir)|g' \
 		$< > $@.tmp && mv $@.tmp $@
 
 EXTRA_DIST = \
diff --git a/distro/systemd/openvpn-client@.service.in b/distro/systemd/openvpn-client@.service.in
index 159fb4dc..15c82fad 100644
--- a/distro/systemd/openvpn-client@.service.in
+++ b/distro/systemd/openvpn-client@.service.in
@@ -3,7 +3,7 @@  Description=OpenVPN tunnel for %I
 After=syslog.target network-online.target
 Wants=network-online.target
 Documentation=man:openvpn(8)
-Documentation=https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage
+Documentation=https://openvpn.net/community-resources/reference-manual-for-openvpn-@OPENVPN_VERSION_MAJOR@-@OPENVPN_VERSION_MINOR@/
 Documentation=https://community.openvpn.net/openvpn/wiki/HOWTO
 
 [Service]
diff --git a/distro/systemd/openvpn-server@.service.in b/distro/systemd/openvpn-server@.service.in
index 6e8e7d94..b26d976b 100644
--- a/distro/systemd/openvpn-server@.service.in
+++ b/distro/systemd/openvpn-server@.service.in
@@ -3,7 +3,7 @@  Description=OpenVPN service for %I
 After=syslog.target network-online.target
 Wants=network-online.target
 Documentation=man:openvpn(8)
-Documentation=https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage
+Documentation=https://openvpn.net/community-resources/reference-manual-for-openvpn-@OPENVPN_VERSION_MAJOR@-@OPENVPN_VERSION_MINOR@/
 Documentation=https://community.openvpn.net/openvpn/wiki/HOWTO
 
 [Service]