From 416d81c4abfb58a6cd780ce0ee694d5d3b687e51 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Mon, 12 Jun 2023 12:39:24 +0200
Subject: [PATCH] openvpn: bring back "openvpn@.service"

Restore "openvpn@.service" from packaging of openvpn 2.3.6, so we can
start the sysmocom vpn the same way as currently described in the
manuals.

Previous patch 8439e71a998cf710869e84d4e56a25256ed0b14f already
attempted to do this, but only brought back "openvpn.service" and not
"openvpn@.service".

Fixes: 8439e71a ("openvpn: bring back openvpn.service file")
Related: SYS#6303
Change-Id: I28a7f491d74690409f815555743679c69e31b518
---
 recipes-extra/openvpn/openvpn/openvpn@.service | 17 +++++++++++++++++
 recipes-extra/openvpn/openvpn_2.5.8.bb         |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 recipes-extra/openvpn/openvpn/openvpn@.service

diff --git a/recipes-extra/openvpn/openvpn/openvpn@.service b/recipes-extra/openvpn/openvpn/openvpn@.service
new file mode 100644
index 0000000..75b0298
--- /dev/null
+++ b/recipes-extra/openvpn/openvpn/openvpn@.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=OpenVPN connection to %i
+PartOf=openvpn.service
+ReloadPropagatedFrom=openvpn.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn.%i.status 10 --cd /etc/openvpn --config /etc/openvpn/%i.conf
+ExecReload=/bin/kill -HUP $MAINPID
+WorkingDirectory=/etc/openvpn
+Restart=always
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target
+
+
diff --git a/recipes-extra/openvpn/openvpn_2.5.8.bb b/recipes-extra/openvpn/openvpn_2.5.8.bb
index 4809548..3a93f57 100644
--- a/recipes-extra/openvpn/openvpn_2.5.8.bb
+++ b/recipes-extra/openvpn/openvpn_2.5.8.bb
@@ -7,11 +7,12 @@ DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '
 
 inherit autotools systemd update-rc.d pkgconfig
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
            file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \
            file://openvpn \
+           file://openvpn@.service \
            file://openvpn.service \
           "