@@ -51,6 +51,7 @@ config-msvc-local.h

 config-msvc-version.h

 doc/openvpn.8.html

 distro/rpm/openvpn.spec

+distro/systemd/*.service

 sample/sample-keys/sample-ca/

 vendor/.build

 vendor/dist

@@ -378,6 +378,7 @@ AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests

 AC_ARG_VAR([MAN2HTML], [path to man2html utility])

 AC_ARG_VAR([GIT], [path to git utility])

 AC_ARG_VAR([SYSTEMD_ASK_PASSWORD], [path to systemd-ask-password utility])

+AC_ARG_VAR([SYSTEMD_UNIT_DIR], [Path of systemd unit directory @<:@default=LIBDIR/systemd/system@:>@])

 AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin])

 AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin])

 AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin])

@@ -1099,6 +1100,12 @@ if test "$enable_systemd" = "yes" ; then

     OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}"

     AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration])

     LIBS="${saved_LIBS}"

+

+    if test -n "${SYSTEMD_UNIT_DIR}"; then

+        systemdunitdir="${SYSTEMD_UNIT_DIR}"

+    else

+        systemdunitdir="\${libdir}/systemd/system"

+    fi

 fi

@@ -1275,6 +1282,8 @@ sampledir="\$(docdir)/sample"

 AC_SUBST([plugindir])

 AC_SUBST([sampledir])

+AC_SUBST([systemdunitdir])

+

 VENDOR_SRC_ROOT="\$(abs_top_srcdir)/vendor/"

 VENDOR_DIST_ROOT="\$(abs_top_builddir)/vendor/dist"

 VENDOR_BUILD_ROOT="\$(abs_top_builddir)/vendor/.build"

@@ -1313,6 +1322,7 @@ AC_CONFIG_FILES([

 	distro/Makefile

 	distro/rpm/Makefile

 	distro/rpm/openvpn.spec

+	distro/systemd/Makefile

 	include/Makefile

 	src/Makefile

 	src/compat/Makefile

@@ -12,6 +12,4 @@

 MAINTAINERCLEANFILES = \

 	$(srcdir)/Makefile.in

-SUBDIRS = rpm

-

-EXTRA_DIST = systemd/openvpn-client@.service systemd/openvpn-server@.service

+SUBDIRS = rpm systemd

new file mode 100644

@@ -0,0 +1,26 @@

+#

+#  OpenVPN -- An application to securely tunnel IP networks

+#             over a single UDP port, with support for SSL/TLS-based

+#             session authentication and key exchange,

+#             packet encryption, packet authentication, and

+#             packet compression.

+#

+#  Copyright (C) 2017 OpenVPN Technologies, Inc. <sales@openvpn.net>

+#

+

+%.service: %.service.in Makefile

+	$(AM_V_GEN)sed -e 's|\@sbindir\@|$(sbindir)|' \

+		$< > $@.tmp && mv $@.tmp $@

+

+EXTRA_DIST = \

+	openvpn-client@.service.in \

+	openvpn-server@.service.in

+

+if ENABLE_SYSTEMD

+systemdunit_DATA = \

+	openvpn-client@.service \

+	openvpn-server@.service

+endif

+

+MAINTAINERCLEANFILES = \

+	$(srcdir)/Makefile.in

deleted file mode 100644

@@ -1,22 +0,0 @@

-[Unit]

-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://community.openvpn.net/openvpn/wiki/HOWTO

-

-[Service]

-Type=notify

-PrivateTmp=true

-RuntimeDirectory=openvpn-client

-RuntimeDirectoryMode=0710

-WorkingDirectory=/etc/openvpn/client

-ExecStart=/usr/sbin/openvpn --suppress-timestamps --nobind --config %i.conf

-CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE

-LimitNPROC=10

-DeviceAllow=/dev/null rw

-DeviceAllow=/dev/net/tun rw

-

-[Install]

-WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,22 @@

+[Unit]

+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://community.openvpn.net/openvpn/wiki/HOWTO

+

+[Service]

+Type=notify

+PrivateTmp=true

+RuntimeDirectory=openvpn-client

+RuntimeDirectoryMode=0710

+WorkingDirectory=/etc/openvpn/client

+ExecStart=@sbindir@/openvpn --suppress-timestamps --nobind --config %i.conf

+CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE

+LimitNPROC=10

+DeviceAllow=/dev/null rw

+DeviceAllow=/dev/net/tun rw

+

+[Install]

+WantedBy=multi-user.target

deleted file mode 100644

@@ -1,22 +0,0 @@

-[Unit]

-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://community.openvpn.net/openvpn/wiki/HOWTO

-

-[Service]

-Type=notify

-PrivateTmp=true

-RuntimeDirectory=openvpn-server

-RuntimeDirectoryMode=0710

-WorkingDirectory=/etc/openvpn/server

-ExecStart=/usr/sbin/openvpn --status %t/openvpn-server/status-%i.log --status-version 2 --suppress-timestamps --config %i.conf

-CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE

-LimitNPROC=10

-DeviceAllow=/dev/null rw

-DeviceAllow=/dev/net/tun rw

-

-[Install]

-WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,22 @@

+[Unit]

+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://community.openvpn.net/openvpn/wiki/HOWTO

+

+[Service]

+Type=notify

+PrivateTmp=true

+RuntimeDirectory=openvpn-server

+RuntimeDirectoryMode=0710

+WorkingDirectory=/etc/openvpn/server

+ExecStart=@sbindir@/openvpn --status %t/openvpn-server/status-%i.log --status-version 2 --suppress-timestamps --config %i.conf

+CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE

+LimitNPROC=10

+DeviceAllow=/dev/null rw

+DeviceAllow=/dev/net/tun rw

+

+[Install]

+WantedBy=multi-user.target