ovpnmain.cgi: Use the helper binary to read the status log

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

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index adf09029baeffb41e841310cf071fea7ec18f0a1..dfa47ad62d588ce25dc88a0fcc774bcec28124df 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -3089,7 +3089,7 @@ END
                        </tr>
 END
 
-       open(FILE, $RW_STATUS) or die "Unable to open $RW_STATUS: $!";
+       open(FILE, "/usr/local/bin/openvpnctrl rw log |") or die "Unable to open $RW_STATUS: $!";
        my @current = <FILE>;
        close(FILE);
 

diff --git a/src/initscripts/system/openvpn-rw b/src/initscripts/system/openvpn-rw
index 49b01daca5e2b76892ef0340dda32c6bcd991457..df83e47b7ee1778400d71076d1623e5e2d4b9538 100644 (file)
--- a/src/initscripts/system/openvpn-rw
+++ b/src/initscripts/system/openvpn-rw
@@ -73,6 +73,12 @@ case "${1}" in
                statusproc /usr/sbin/openvpn
                ;;
 
+       log)
+               if [ -r "/var/run/openvpn-rw.log" ]; then
+                       cat "/var/run/openvpn-rw.log"
+               fi
+               ;;
+
        *)
                echo "Usage: ${0} {start|stop|reload|restart|status}"
                exit 1