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 4ZypQx3Dy4z33rP for ; Thu, 15 May 2025 11:49:29 +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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZypQs6v7dz30V0 for ; Thu, 15 May 2025 11:49:25 +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 4ZypQs3hcDz2r4; Thu, 15 May 2025 11:49:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747309765; 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: in-reply-to:in-reply-to:references:references; bh=oNaFVXj54rHlY/xt0yFzmsTVbwejolbq7qX/mAF22TU=; b=3xBqtEz1CzHCmF1KxbstLVAtP3S3ykEz39Fxlg7aHOdI+nFEJHQ/c5WZ3ohIzPssKMDnMe uSWO1pWjDaxMS/Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747309765; 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: in-reply-to:in-reply-to:references:references; bh=oNaFVXj54rHlY/xt0yFzmsTVbwejolbq7qX/mAF22TU=; b=G2syl9OKiae/0YcuxRD2+DGtR9/WUtR3sDWlmwl0g7k2hgVazDnU9itohFjvFGdEQL5ylA Xjb5EgjT/3L1PxoFNefDQdg0tPrudmOo7MJdjoBTNTQt0p6O2nqqpwguxX7lNTRu+Iatof 5PmRUrdj7H86gD/mAA1wZwpLG8S6ruHaw/yjf7fs4izfa/sCyyzoecvBRrh53c3+hZ/8ug s9pd5UCCE1nehxE5XctB5kvFKjD8JtWZNiRDUNw42utEyyQ/LZGDe0quM6JnW4U4IbVL1y Kzp0WqMT+VdeNVgvTuy9ROF0pDwG4pQJWEAu8plNQ4L/Yqb+UVp6yxMdfUS+SQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 2/4] netovpnsrv.cgi: Fixes rrd file names for n2n openvpn graphs Date: Thu, 15 May 2025 13:49:18 +0200 Message-ID: <20250515114920.12919-2-adolf.belka@ipfire.org> In-Reply-To: <20250515114920.12919-1-adolf.belka@ipfire.org> References: <20250515114920.12919-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 Content-Transfer-Encoding: 8bit - An additional rrd file name change missed from collect-5 update. - This was identified as part of fixing bug13834 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/netovpnsrv.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index 1fb66e7a4..7bc5d8509 100644 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -55,7 +55,7 @@ foreach my $key (sort {$vpnsettings{$a}[1] <=> $vpnsettings{$b}[1]} keys %vpnset my @vpngraphs = `find /var/log/rrd/collectd/localhost/openvpn-*-n2n/ -not -path *openvpn-UNDEF* -name *traffic.rrd 2>/dev/null|sort`; foreach (@vpngraphs){ - if($_ =~ /(.*)\/openvpn-(.*)\/if_octets_derive-traffic.rrd/){ + if($_ =~ /(.*)\/openvpn-(.*)\/if_octets-traffic.rrd/){ push(@vpns,$2); } } -- 2.49.0