From patchwork Mon Mar 17 19:51:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8522 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 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 web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZGlwS24Xjz3xFJ for ; Mon, 17 Mar 2025 19:51:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZGlwP1l5Zz5c6 for ; Mon, 17 Mar 2025 19:51:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZGlwP10RLz34PV for ; Mon, 17 Mar 2025 19:51:33 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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 4ZGlwL0bVxz2xc2 for ; Mon, 17 Mar 2025 19:51:30 +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 4ZGlwK0ns9z4nJ; Mon, 17 Mar 2025 19:51:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1742241089; 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=1Zx11q7i2Jcb3y/Xz+uCuMGZ0k26q3eZ6tUM4Tj4kMY=; b=Ur/iiY69ZLfLyLGMoibBIe3/Eowv+3RhBW6bY2O1mJu3sm1p6YVkeqcqksvs4g5gULKG1w 7Fr+UsUCxYXFXkAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1742241089; 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=1Zx11q7i2Jcb3y/Xz+uCuMGZ0k26q3eZ6tUM4Tj4kMY=; b=MrXaOid5ybkndBWDFFrK31Dp1Hy3u4bIY2oPFWkBlf9wITofiwlDZRe3M4Vo5/hgUlI5aX Awx7azjKM53t+ujM7HNaT5b38jRiuLrP8hBNggSv6fgYNQSLP/c7WpftpN9XUHygyn69k1 pyIyVPueLc+Ztr8eqgHkPx/V4/fRn2XckaXae8f2DtjOu/sgkF1EMw46gY12SCZv68fH+n RsA/v0LZ6XHdRWgjb8e6IC53HJcBiYeUlIpUTCiu97PF0Ti4fBfTrvNJrgR23LxKcHbcOF ugL0Hufs3tTJ5v3G9WDNfBPJHUrTJXQvujwZVO3c55kQ0uANZ0EbDguVxweg3Q== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 1/3] collectd: Fixes bug13832 - uncomments include openvpn plugin only if openvpn is running Date: Mon, 17 Mar 2025 20:51:21 +0100 Message-ID: <20250317195123.2092-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 - Added code to check if openvpn.pid exists and only then uncomment the include openvpn plugin line in collectd.conf - Tested out on my vm testbed and the include openvpn plugin line in collectd.conf is only uncommented if the openvpn server is run ning and has a pid. Fixes: Bug13832 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- src/initscripts/system/collectd | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 263511fc7..f86b64e9d 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -143,6 +143,13 @@ case "$1" in sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf fi + # Enable openvpn plugin if openvpn.pid found + if [ ! -e /var/run/openvpn.pid ]; then + sed -i -e 's|^include "/etc/collectd.vpn"$|#include "/etc/collectd.vpn"|g' /etc/collectd.conf + else + sed -i -e 's|^#include "/etc/collectd.vpn"$|include "/etc/collectd.vpn"|g' /etc/collectd.conf + fi + if [ $(date +%Y) -gt 2011 ]; then boot_mesg "Starting Collection daemon..." /usr/sbin/collectd -C /etc/collectd.conf