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 <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/wio/wio.pl b/config/wio/wio.pl
index 78c91eeb959cde7cb93fdb8f995df60a4a023c3a..8efbe600ff7a3fc6c77b62b4bd048b5c4acc087d 100644 (file)
--- 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 80b020dc9323aa3710b7ae9692440fce563eaf1c..279b858b4e28813e68b034fdd16dd8ef7fceaf8c 100644 (file)
--- 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 d988ec597380a7d879b3b37f8bbbf5e3a7d8c0d1..9975c294d3af232122eebfb2f1a442613059c050 100644 (file)
--- a/html/cgi-bin/wio.cgi
+++ b/html/cgi-bin/wio.cgi
@@ -84,7 +84,7 @@ my $rrddir       = "/var/log/rrd/wio";
 my $refreshbox   = '<meta http-equiv="refresh" content="0;url=/cgi-bin/wio.cgi">';
 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        = '-';