From 124f2f2fa5dabbb27d57513cfa2c689dbf106425 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Mon, 15 Sep 2025 14:07:24 +0200 Subject: [PATCH] wio: Update openvpn.pid to openvpn-rw.pid - This change was needed together with the log file name change to have wio show the openvpn statuses. - Tested and confirmed on my vm testbed. - Will leave it to be decided if this gets merged into CU197 Testing or waits for CU198 Either is fine for me. Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer --- config/wio/wio.pl | 2 +- config/wio/wiovpn.pl | 2 +- html/cgi-bin/wio.cgi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/wio/wio.pl b/config/wio/wio.pl index 78c91eeb95..8efbe600ff 100644 --- a/config/wio/wio.pl +++ b/config/wio/wio.pl @@ -82,7 +82,7 @@ if ( -e $rediface ) { my $redip = $hostname; my $vpnpid = ( -e "/var/run/charon.pid" ? `awk '{print $1}' /var/run/charon.pid`: ''); -my $ovpnpid = ( -e "/var/run/openvpn.pid" ? `awk '{print $1}' /var/run/openvpn.pid`: ''); +my $ovpnpid = ( -e "/var/run/openvpn-rw.pid" ? `awk '{print $1}' /var/run/openvpn-rw.pid`: ''); my $steptime = $wiosettings{'CRON'} *= 60; my $i_ping = 'icmp'; diff --git a/config/wio/wiovpn.pl b/config/wio/wiovpn.pl index 80b020dc93..279b858b4e 100644 --- a/config/wio/wiovpn.pl +++ b/config/wio/wiovpn.pl @@ -51,7 +51,7 @@ my $logging = $wiosettings{'LOGGING'}; my ( @ovpnstatus, @ovpncfg, @ovpncache, @ovpnarray, @ovpnmatch, @ovpnwrite ); my $now = strftime "%a, %d.%m.%Y %H:%M:%S", localtime; -my $ovpnpid = "/var/run/openvpn.pid"; +my $ovpnpid = "/var/run/openvpn-rw.pid"; my $ovpnmailmsg = ''; my $ovpncache = "/var/log/wio/.ovpncache"; my $ovpnconfig = "/var/ipfire/ovpn/ovpnconfig"; diff --git a/html/cgi-bin/wio.cgi b/html/cgi-bin/wio.cgi index d988ec5973..9975c294d3 100644 --- a/html/cgi-bin/wio.cgi +++ b/html/cgi-bin/wio.cgi @@ -84,7 +84,7 @@ my $rrddir = "/var/log/rrd/wio"; my $refreshbox = ''; my $sortstring = '^IPADR|^HOST'; my $ovpnaddon = "/var/ipfire/ovpn"; -my $ovpnpid = "/var/run/openvpn.pid"; +my $ovpnpid = "/var/run/openvpn-rw.pid"; my $vpnpid = "/var/run/charon.pid"; my $redactive = "/var/ipfire/red/active"; my $redip = '-'; -- 2.47.3