From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZhklV4RWdz32dy for ; Tue, 22 Apr 2025 14:15:02 +0000 (UTC) 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 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZhklV4JLLz2y9H for ; Tue, 22 Apr 2025 14:15:02 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (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 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZhklV0tbYz19H for ; Tue, 22 Apr 2025 14:15:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1745331302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=YzDGMsRvMzxSYTptA09aQgPv1BpZsZbIOFHovlirn/0=; b=rPPUwM1uxbvGEC/hnYm+IE52I0YMVJET50EeV5/RLs6n142gd/RI2fMkjuYae9CLZ8jA5u MfGBrDr5345KW8CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1745331302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=YzDGMsRvMzxSYTptA09aQgPv1BpZsZbIOFHovlirn/0=; b=MZOkgBShXxXgshPcgWVkSrQiJNnLQx5T1V1b0rfIL9X5gEfpSK6PyuRDenezhQwbI1Ywfy I0IdVxSy1wC5j14/VRIpaon9gmouopeZpo38UJGNHILF8Nkf14YaHs97ezxbbD9WKy1pcA k98tobeLgD7WikKEO1HhN2s7D2Vpsro2MfXxq5zIFnlOlzhsqwipCtkOGFDMZrrircfulx oXAQ81uHK8QCsUylR1pQ9yYBjjNf/FqWLPfBwUWrlTpFo/G7iUIdVcDAjQmc2stcluCk4b 0n4wNaHNBlCeEVkgbOFKq5WurNCllJSqzwhGhV3sL0tDw5wrgP7N0gvFLTYkpg== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZhklT5h9Cz2y6T; Tue, 22 Apr 2025 14:15:01 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 610ed2f195d1447f8f56b9796d916edf2800661f X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 678fa86af6129b960b6efe419a21a24507c6d993 X-Git-Newrev: 610ed2f195d1447f8f56b9796d916edf2800661f Message-Id: <4ZhklT5h9Cz2y6T@people01.haj.ipfire.org> Date: Tue, 22 Apr 2025 14:15:01 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 610ed2f195d1447f8f56b9796d916edf2800661f (commit) via 264b564c9cf78116b21236472fed08aacfd2b8d1 (commit) via a5c82e0839b5e5f354b972c6c002f81a4f3ebad0 (commit) from 678fa86af6129b960b6efe419a21a24507c6d993 (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 610ed2f195d1447f8f56b9796d916edf2800661f Author: Adolf Belka Date: Mon Apr 7 20:43:45 2025 +0200 core194: Ship graphs.pl and netovpnrw.cgi for bug13838 fixes. Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 264b564c9cf78116b21236472fed08aacfd2b8d1 Author: Adolf Belka Date: Mon Apr 7 20:43:44 2025 +0200 netovpnrw.cgi: Fixes bug13838 - additional file name correction for collectd-5.x - One location in netovpnrw.cgi was missed with a filename change coming from the collectd update. - This resulted in missing graph content for the openvpn road warrior graphs. - Tested out on my production IPFire system. Making the change resulted in the grahs being visible again. Fixes: Bug13838 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit a5c82e0839b5e5f354b972c6c002f81a4f3ebad0 Author: Adolf Belka Date: Mon Apr 7 20:43:43 2025 +0200 graphs.pl: Fixes bug13838 - additional file name corrections for collectd-5.x - Two locations in graphs.pl were missed with filename changes coming from the collectd update. - These result in missing graph content for the openvpn road warrior graphs. - Tested out on my production IPFire system. Making the changes resulted in the grahs being visible again. Fixes: bug13838 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/cfgroot/graphs.pl | 4 ++-- config/rootfiles/core/194/filelists/files | 2 ++ html/cgi-bin/netovpnrw.cgi | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index aba1ef0ef..8308d2443 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -493,8 +493,8 @@ sub updatevpngraph { "--color=SHADEA".$color{"color19"}, "--color=SHADEB".$color{"color19"}, "--color=BACK".$color{"color21"}, - "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:rx:AVERAGE", - "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets_derive.rrd:tx:AVERAGE", + "DEF:incoming=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets.rrd:rx:AVERAGE", + "DEF:outgoing=".$mainsettings{'RRDLOG'}."/collectd/localhost/openvpn-$interface/if_octets.rrd:tx:AVERAGE", "CDEF:outgoingn=outgoing,-1,*", "COMMENT:".sprintf("%-20s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), diff --git a/config/rootfiles/core/194/filelists/files b/config/rootfiles/core/194/filelists/files index 03dfa2929..91c017ed2 100644 --- a/config/rootfiles/core/194/filelists/files +++ b/config/rootfiles/core/194/filelists/files @@ -6,3 +6,5 @@ etc/ssl/openssl.cnf srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/backup/include var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/netovpnrw.cgi +var/ipfire/graphs.pl diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index 5014f9a55..fb81e9ffe 100644 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -43,7 +43,7 @@ my @vpns=(); my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*/ -not -path *openvpn-UNDEF* -not -path *openvpn-*n2n* -name *.rrd 2>/dev/null|sort`; foreach (@vpngraphs){ - if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive.rrd/){ + if($_ =~ /(.*)\/openvpn-(.*)\/if_octets.rrd/){ push(@vpns,$2); } } hooks/post-receive -- IPFire 2.x development tree