[arch-commits] Commit in openvpn/trunk (PKGBUILD openvpn at .service)

[Christian Hesse]

    Date: Tuesday, July 19, 2016 @ 06:16:36
  Author: eworm
Revision: 271994

update the systemd unit file (FS#43278)

Note that we add After= for targets, but skip Wants=. This ensures correct
ordering, but does not break by pulling in non-existent targets.

We do not use upstream unit files, though. We have different structure and
do not want to break configuration for everybody.

Modified:
  openvpn/trunk/PKGBUILD
  openvpn/trunk/openvpn at .service

------------------+
 PKGBUILD         |    3 +--
 openvpn at .service |    6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-19 05:53:15 UTC (rev 271993)
+++ PKGBUILD	2016-07-19 06:16:36 UTC (rev 271994)
@@ -11,12 +11,11 @@
 optdepends=('easy-rsa: easy CA and certificate handling')
 makedepends=('systemd')
 license=('custom')
-install=openvpn.install
 source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.xz{,.asc}
         openvpn at .service)
 sha256sums=('0f5f1ca1dc5743fa166d93dd4ec952f014b5f33bafd88f0ea34b455cae1434a7'
             'SKIP'
-            '47a4ee993f8aaa7370e9a84384fcfc993fd76aa4db11c46629b156d0c5fad49a')
+            '28840ef1e4c7c80da1d9de3224fad8e8540e0cf58326d65227cf3ce7ab867990')
 validpgpkeys=('03300E11FED16F59715F9996C29D97ED198D22A3')  # Samuli Seppänen
 
 build() {

Modified: openvpn at .service
===================================================================
--- openvpn at .service	2016-07-19 05:53:15 UTC (rev 271993)
+++ openvpn at .service	2016-07-19 06:16:36 UTC (rev 271994)
@@ -1,10 +1,12 @@
 [Unit]
-Description=OpenVPN connection to %i
+Description=OpenVPN connection to %I
+After=syslog.target network.target network-online.target
+Documentation=man:openvpn(8)
 
 [Service]
 PrivateTmp=true
 Type=forking
-ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --writepid /run/openvpn@%i.pid --status-version 2
+ExecStart=/usr/bin/openvpn --cd /etc/openvpn --config %i.conf --daemon openvpn@%i --writepid /run/openvpn@%i.pid --status-version 2
 PIDFile=/run/openvpn@%i.pid
 CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH
 LimitNPROC=10