Message ID | 20250908125938.3389609-2-adolf.belka@ipfire.org |
---|---|
State | New |
Headers |
Return-Path: <development+bounces-925-patchwork=ipfire.org@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) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4cL6VZ5dl4z3wZx for <patchwork@web04.haj.ipfire.org>; Mon, 08 Sep 2025 12:59:50 +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 4cL6VZ4t0Cz3WL for <patchwork@ipfire.org>; Mon, 08 Sep 2025 12:59:50 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=ipfire.org header.s=202003ed25519 header.b=czUvAcEk; dkim=pass header.d=ipfire.org header.s=202003rsa header.b=hBn9w4OJ; spf=softfail (mail01.ipfire.org: 2001:678:b28::201 is neither permitted nor denied by domain of "development+bounces-925-patchwork=ipfire.org@lists.ipfire.org") smtp.mailfrom="development+bounces-925-patchwork=ipfire.org@lists.ipfire.org"; dmarc=pass (policy=reject) header.from=ipfire.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757336390; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=UPNN05V9h2vR8pQgQxcDisiWhB9qv5VYDYQkAKcCHEc=; b=g2tBsmp1C7+9o5E1PNcSqSYW+IT1XiCfMmZ8EPP23QIf7p2EvbdrU2sluyMgghNpbOy2C6 otc3s28uCNjIwJacm63gIVDxlWPFvMRpUo0FgMSeZKruqZ81XP3yIxWu7nLC6X3DUQA51Q kEs7mMlyt/bWd+R2muor5F05N7O1ZOdjn2fEqwarQWh/j2uIEMsFe/SFyh04qylRa3lsaM UYBlGLCFn08xKe8+esriq43mwi4gA0CC77bKPPlADmOMwQZ56uKeXhd9BXgV+MtCmnbRWb bKVkygidqeeMSFoKDShK6/egLeEHrSxEmt5WNbMyAtLmoGLJ8VZLwXxo7y+jug== ARC-Seal: i=1; s=202003rsa; d=ipfire.org; t=1757336390; a=rsa-sha256; cv=none; b=s14dQ+gZAcoJxn/SIDst+HeJTcxeT7exBDICKhYhbJC67lhYGqMaNxsKpoGLEKDisvUfjV 8xu8lcXrsqfC1Anu/WxGv/YoM0mt8+dEGJiyVaVU4708DDQQ3CPAHmHOZ1q2xsbUQFJYpX IAmVad0auRSKocGj7YbFnMyimtiJf/AvlDEJExfZXtlIMljF93we+ZNRXQzHdXOJ7SNCgy 9BxfhnLZnIDWwRqfpqxW1mW3w3PKOkQ5A3qgbQJT1UIUkInnHRM1mCGg0xhiZSMsmYk+vw XWuUYk7edbymYcITaoGKKdbWqEG58yDq4073BQ+hDl8aZYU9WTQ277Xl1eGPhQ== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=ipfire.org header.s=202003ed25519 header.b=czUvAcEk; dkim=pass header.d=ipfire.org header.s=202003rsa header.b=hBn9w4OJ; spf=softfail (mail01.ipfire.org: 2001:678:b28::201 is neither permitted nor denied by domain of "development+bounces-925-patchwork=ipfire.org@lists.ipfire.org") smtp.mailfrom="development+bounces-925-patchwork=ipfire.org@lists.ipfire.org"; dmarc=pass (policy=reject) header.from=ipfire.org Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cL6VZ47Qdz2yn4 for <patchwork@ipfire.org>; Mon, 08 Sep 2025 12:59:50 +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) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cL6VW71zJz30T1 for <development@lists.ipfire.org>; Mon, 08 Sep 2025 12:59:47 +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 4cL6VQ5F9Wz31f; Mon, 08 Sep 2025 12:59:42 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757336382; 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=UPNN05V9h2vR8pQgQxcDisiWhB9qv5VYDYQkAKcCHEc=; b=czUvAcEkzK6Cyk9nGeeVCcFeAvLjJiNFV9q/emL7Pd5Md0ECK29QInlT8ooBaxCJTyXXs3 kUJYr/OFb136eMDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757336382; 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=UPNN05V9h2vR8pQgQxcDisiWhB9qv5VYDYQkAKcCHEc=; b=hBn9w4OJXwBBPdTPC2xa2Eo4J2kKvoYLMaLGEvSM1C0rbk6+ApUd+XkcLeBHJXD9TgKdIb LsqyviIMS5wWeNMsSH4YwKyqBOL4VsGVdxmNEbHk4tgJ1kXGwPwuxxmM5IkyasMyYwvArg 2KeTuN3F78nJY2R0T5dBQdP0B58m4TRcA4O9sv6mLmFCphjmqBTaDbb10bDPhBZcGeCI9W UJtgLA/4Ucgsm9vKhk2dedCx/FFp66OBm6UzEG0zVwFMyj0ZPEZcCHucrC7U0asAox263Z cZSvTwyQ6I/X5gPIf1xkrZFn6J0sMiqldNHzo1UWH7HdzcuLJ6TrhEl6Ajm3dg== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Cc: Adolf Belka <adolf.belka@ipfire.org> Subject: [PATCH 2/2] backup.pl: Update the RW entry in collectd.vpn if restoring old backup Date: Mon, 8 Sep 2025 14:59:38 +0200 Message-ID: <20250908125938.3389609-2-adolf.belka@ipfire.org> In-Reply-To: <20250908125938.3389609-1-adolf.belka@ipfire.org> References: <20250908125938.3389609-1-adolf.belka@ipfire.org> Precedence: list List-Id: <development.lists.ipfire.org> List-Subscribe: <https://lists.ipfire.org/>, <mailto:development+subscribe@lists.ipfire.org?subject=subscribe> List-Unsubscribe: <https://lists.ipfire.org/>, <mailto:development+unsubscribe@lists.ipfire.org?subject=unsubscribe> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development+help@lists.ipfire.org?subject=help> Sender: <development@lists.ipfire.org> Mail-Followup-To: <development@lists.ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-10.64 / 11.00]; BAYES_HAM(-3.00)[99.99%]; DWL_DNSWL_MED(-2.00)[ipfire.org:dkim]; FROM_INTERNAL_BULK_SENDERS(-2.00)[2001:678:b28::201]; R_DKIM_ALLOW(-1.68)[ipfire.org:s=202003ed25519,ipfire.org:s=202003rsa]; NEURAL_HAM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DKIM_REPUTATION(-0.95)[-0.94593865340233]; IP_REPUTATION_HAM(-0.72)[asn: 204867(-0.21), country: DE(-0.00), ip: 2001:678:b28::(-0.51)]; DMARC_POLICY_ALLOW_WITH_FAILURES(-0.50)[]; R_MISSING_CHARSET(0.50)[]; MAILLIST(-0.18)[generic]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; MX_GOOD(-0.01)[]; RECEIVED_HELO_LOCALHOST(0.00)[]; ASN(0.00)[asn:204867, ipnet:2001:678:b28::/48, country:DE]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_COUNT_THREE(0.00)[3]; FROM_NEQ_ENVFROM(0.00)[adolf.belka@ipfire.org,development@lists.ipfire.org]; DKIM_TRACE(0.00)[ipfire.org:+]; FORGED_SENDER_MAILLIST(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DMARC_POLICY_ALLOW(0.00)[ipfire.org,reject]; R_SPF_SOFTFAIL(0.00)[~all:c]; ARC_SIGNED(0.00)[ipfire.org:s=202003rsa:i=1]; TAGGED_FROM(0.00)[bounces-925-patchwork=ipfire.org]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Action: no action X-Rspamd-Queue-Id: 4cL6VZ4t0Cz3WL |
Series |
[1/2] update.sh: Update collectd.vpn to the new RW log file name
|
|
Commit Message
Adolf Belka
8 Sep 2025, 12:59 p.m. UTC
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
config/backup/backup.pl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/config/backup/backup.pl b/config/backup/backup.pl index e79f510c6..8988427ea 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -349,8 +349,12 @@ restore_backup() { rm /var/log/pakfire.log fi - # Update the OpenVPN configuration and restart the openvpn daemons + # Update the OpenVPN configuration, update the RW log entry in collectd.vpn + # if it is the old name and restart the openvpn daemons sudo -u nobody /srv/web/ipfire/cgi-bin/ovpnmain.cgi + if grep -q "/var/run/ovpnserver.log" /var/ipfire/ovpn/collectd.vpn; then + sed -i 's|"/var/run/ovpnserver.log"|"/var/run/openvpn-rw.log"|' /var/ipfire/ovpn/collectd.vpn + fi /etc/init.d/openvpn-n2n restart /etc/init.d/openvpn-rw restart