From 791c54786c2cb2f6500e20f931b33fbb234a8ce4 Mon Sep 17 00:00:00 2001
From: Nyr <me@nyr.be>
Date: Tue, 6 Sep 2016 16:20:52 +0200
Subject: [PATCH] Better way to enable IP forwarding

Should be more universal than the previous approach.
---
 openvpn-install.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/openvpn-install.sh b/openvpn-install.sh
index 279a1e7..620f410 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -286,15 +286,9 @@ status openvpn-status.log
 verb 3
 crl-verify crl.pem" >> /etc/openvpn/server.conf
 	# Enable net.ipv4.ip_forward for the system
-	if [[ "$OS" = 'debian' ]]; then
-		sed -i 's|#net.ipv4.ip_forward=1|net.ipv4.ip_forward=1|' /etc/sysctl.conf
-	else
-		# CentOS 5 and 6
-		sed -i 's|net.ipv4.ip_forward = 0|net.ipv4.ip_forward = 1|' /etc/sysctl.conf
-		# CentOS 7
-		if ! grep -q "net.ipv4.ip_forward=1" "/etc/sysctl.conf"; then
-			echo 'net.ipv4.ip_forward=1' >> /etc/sysctl.conf
-		fi
+	sed -i '/net.ipv4.ip_forward/c\net.ipv4.ip_forward=1' /etc/sysctl.conf
+	if ! grep -q "net.ipv4.ip_forward" /etc/sysctl.conf; then
+		echo 'net.ipv4.ip_forward=1' >> /etc/sysctl.conf
 	fi
 	# Avoid an unneeded reboot
 	echo 1 > /proc/sys/net/ipv4/ip_forward