From 0187917c729bf75909b777d7254dbce9314fc3a7 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 19 Mar 2024 16:18:44 +0100
Subject: [PATCH] ovpnmain.cgi: Tidy up starting/restarting the RW server

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index eed765118..03084880b 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -720,29 +720,17 @@ if ( -e "${General::swroot}/ovpn/gencanow") {
 }
 ##hier die refresh page
 
-
 ###
 ### OpenVPN Server Control
 ###
-if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'} ||
-    $cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'} ||
-    $cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}) {
-    #start openvpn server
-    if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}){
-    	&emptyserverlog();
+
+if ($cgiparams{'ACTION'} eq $Lang::tr{'start ovpn server'}) {
+	&emptyserverlog();
 	&General::system("/usr/local/bin/openvpnctrl", "-s");
-    }
-    #stop openvpn server
-    if ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}){
+
+} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'stop ovpn server'}) {
 	&General::system("/usr/local/bin/openvpnctrl", "-k");
 	&emptyserverlog();
-    }
-#    #restart openvpn server
-#    if ($cgiparams{'ACTION'} eq $Lang::tr{'restart ovpn server'}){
-#workarund, till SIGHUP also works when running as nobody
-#   	system('/usr/local/bin/openvpnctrl', '-r');
-#	&emptyserverlog();
-#    }
 }
 
 ###
-- 
2.47.3