From patchwork Mon Sep 15 12:07:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9080 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4cQP0y5V6Lz3wk2 for ; Mon, 15 Sep 2025 12:07:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [IPv6:2001:678:b28::201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cQP0y4CMZz3wN for ; Mon, 15 Sep 2025 12:07:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cQP0y3WMPz2yVK for ; Mon, 15 Sep 2025 12:07:30 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cQP0v6Q9tz2xMK for ; Mon, 15 Sep 2025 12:07:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4cQP0v0dWHz1fv; Mon, 15 Sep 2025 12:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757938047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yijLKixnBx4ggqT+ScpG0TQ38OWiVRvTOClicmP+wWg=; b=Wq0uJ3zSEqn4P6fDMy2q834sdWVtTaTDdZOL2SPELEHSiipl1Fs9+GEqu/AGZJLvYMAXQJ l85vaGBgZ6R81q16HSXduFSDRI541iIM4E1GJvvNQuMgxRJdsM4npnZyiMFCd+55GPrR1N y5tZ500HvVN1tV/m81tyCaDV9Xk5UMS1+Nqc3w8DpUzr5pgy/nA8xMhs3WMNc2syWy3HUz a8SzEQ/Wrpn0H5dG/bfMow8oV0pL/uP+KL2tMaJZtDtoqNhkH5oDlTyG5L/IFB4Fof9S1t eoPCvFN3kmIrTKk3jLKLmlLlEo/+DS1RCyBQDlaEkG97rGmZLzy+c2V/tDnbzw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757938047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yijLKixnBx4ggqT+ScpG0TQ38OWiVRvTOClicmP+wWg=; b=ptQGmXmSE6srMFWO3GRd6Jr5RWzl9mrRZzjEK5Ec/xaZN2kjnTFtIy26UF/N6bp32vpHa1 7QEVoBm6f8oPUWCQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] wio: Update openvpn.pid to openvpn-rw.pid Date: Mon, 15 Sep 2025 14:07:24 +0200 Message-ID: <20250915120724.2593987-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - 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 --- 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 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/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 = ''; 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 = '-';