[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 124f2f2fa5dabbb27d57513cfa2c689dbf106425

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 124f2f2fa5dabbb27d57513cfa2c689dbf106425

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  124f2f2fa5dabbb27d57513cfa2c689dbf106425 (commit)
       via  8d69563fb048ec7aecd116947a72516b79dbd3bf (commit)
       via  44ea44efd6ce52eec09573da3a007b26e44dfbe5 (commit)
      from  d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 124f2f2fa5dabbb27d57513cfa2c689dbf106425
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Sep 15 14:07:24 2025 +0200

    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>

commit 8d69563fb048ec7aecd116947a72516b79dbd3bf
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Sep 15 14:19:39 2025 +0000

    core197: Ship ids.cgi
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 44ea44efd6ce52eec09573da3a007b26e44dfbe5
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Mon Sep 15 14:03:25 2025 +0200

    ids.cgi: Update openvpn.pid to openvpn-rw.pid
    
    - This is needed to enable showing of the OpenVPN as a zone to use for the IDS
    
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/197/filelists/files | 1 +
 config/wio/wio.pl                         | 2 +-
 config/wio/wiovpn.pl                      | 2 +-
 html/cgi-bin/ids.cgi                      | 2 +-
 html/cgi-bin/wio.cgi                      | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/197/filelists/files b/config/rootfiles/core/197/filelists/files
index 8e79a54c4..c25eb4b8e 100644
--- a/config/rootfiles/core/197/filelists/files
+++ b/config/rootfiles/core/197/filelists/files
@@ -16,6 +16,7 @@ etc/sysconfig/createfiles
 lib/udev/network-hotplug-master
 lib/udev/network-hotplug-rename
 lib/udev/rules.d/60-net.rules
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
diff --git a/config/wio/wio.pl b/config/wio/wio.pl
index 78c91eeb9..8efbe600f 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 80b020dc9..279b858b4 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/ids.cgi b/html/cgi-bin/ids.cgi
index 960e72ef1..d96aa850b 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -57,7 +57,7 @@ my @network_zones = &Network::get_available_network_zones();
 push(@network_zones, "ipsec", "wg");
 
 # Check if openvpn is started and add it to the array of network zones.
-if ( -e "/var/run/openvpn.pid") {
+if ( -e "/var/run/openvpn-rw.pid") {
 	push(@network_zones, "ovpn");
 }
 
diff --git a/html/cgi-bin/wio.cgi b/html/cgi-bin/wio.cgi
index d988ec597..9975c294d 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   = '<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        = '-';


hooks/post-receive
--
IPFire 2.x development tree