Revert "OpenVPN: Add start of static routes in client N2N"

This reverts commit 1c612d9e326a477bb1cbad719702c51c35f11d62.

https://lists.ipfire.org/pipermail/development/2020-November/008773.html

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 0ab053a627aa7f0c2fa2cb9b944163eafd6cbf96..68a70d14777f4d07711201e7f08b71c0d636eab6 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -948,7 +948,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n"; 
   print SERVERCONF "# Client Gateway Network\n"; 
   print SERVERCONF "route $remsubnet[0] $remsubnet[1]\n";
-  print SERVERCONF "# Call up script for static routes\n";
   print SERVERCONF "up \"/etc/init.d/static-routes start\"\n";
   print SERVERCONF "# tun Device\n"; 
   print SERVERCONF "dev tun\n"; 
@@ -1048,6 +1047,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n"; 
   print CLIENTCONF "# Server Gateway Network\n"; 
   print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n"; 
+  print CLIENTCONF "up \"/etc/init.d/static-routes start\"\n";
   print CLIENTCONF "# tun Device\n"; 
   print CLIENTCONF "dev tun\n"; 
   print CLIENTCONF "#Logfile for statistics\n";
@@ -3322,12 +3322,6 @@ END
        print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n";
        close FILE;
 
-       # Add static route command to client configuration
-       open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config file.';
-       print FILE "# Call up script for static routes\n";
-       print FILE "up \"/etc/init.d/static-routes start\"\n";
-       close FILE;
-
        move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname[0]/$uplconffilename2");
 
        if ($? ne 0) {