From 9e05390c0c9e6ac2bc206990d5da462078a6c6a3 Mon Sep 17 00:00:00 2001
From: angristan <angristan@pm.me>
Date: Mon, 17 Sep 2018 16:19:44 +0200
Subject: [PATCH] Rework and cleanup service handling

---
 openvpn-install.sh | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/openvpn-install.sh b/openvpn-install.sh
index e72a814..5a27bbe 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -784,35 +784,23 @@ verb 3" >> /etc/openvpn/server.conf
 		fi
 	fi
 
-	# And finally, restart OpenVPN
-	if [[ "$OS" = 'debian' ]]; then
-		# Little hack to check for systemd
-		if pgrep systemd-journal; then
-				#Workaround to fix OpenVPN service on OpenVZ
-				sed -i 's|LimitNPROC|#LimitNPROC|' /lib/systemd/system/openvpn\@.service
-				sed -i 's|/etc/openvpn/server|/etc/openvpn|' /lib/systemd/system/openvpn\@.service
-				systemctl daemon-reload
-				systemctl restart openvpn@server
-				systemctl enable openvpn@server
-		else
-			/etc/init.d/openvpn restart
-		fi
+	# Finally, restart and enable OpenVPN
+	if [[ "$OS" = 'fedora' ]]; then
+		# Workaround to fix OpenVPN service on OpenVZ
+		sed -i 's|LimitNPROC|#LimitNPROC|' /usr/lib/systemd/system/openvpn-server@.service
+		# Another workaround to keep using /etc/openvpn/
+		sed -i 's|/etc/openvpn/server|/etc/openvpn|' /usr/lib/systemd/system/openvpn-server@.service
+		systemctl daemon-reload
+		systemctl restart openvpn-server@server
+		systemctl enable openvpn-server@server
 	else
-		if pgrep systemd-journal; then
-			if [[ "$OS" = 'fedora' ]]; then
-				# Workaround to avoid rewriting the entire script for Fedora
-				sed -i 's|/etc/openvpn/server|/etc/openvpn|' /usr/lib/systemd/system/openvpn-server@.service
-				systemctl daemon-reload
-				systemctl restart openvpn-server@openvpn
-				systemctl enable openvpn-server@openvpn
-			else
-				systemctl restart openvpn@server
-				systemctl enable openvpn@server
-			fi
-		else
-			service openvpn restart
-			chkconfig openvpn on
-		fi
+		# Workaround to fix OpenVPN service on OpenVZ
+		sed -i 's|LimitNPROC|#LimitNPROC|' /lib/systemd/system/openvpn\@.service
+		# Another workaround to keep using /etc/openvpn/
+		sed -i 's|/etc/openvpn/server|/etc/openvpn|' /lib/systemd/system/openvpn\@.service
+		systemctl daemon-reload
+		systemctl restart openvpn@server
+		systemctl enable openvpn@server
 	fi
 
 	# If the server is behind a NAT, use the correct IP address