From patchwork Sat Jul 9 10:21:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5734 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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Lg5m21d3Jz3wwD for ; Sat, 9 Jul 2022 10:21:38 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Lg5m05RFCzh4; Sat, 9 Jul 2022 10:21:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Lg5m04Gzqz2yp1; Sat, 9 Jul 2022 10:21:36 +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 (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Lg5lz4Fnkz2xPk for ; Sat, 9 Jul 2022 10:21:35 +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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Lg5ly3s3Bz10H for ; Sat, 9 Jul 2022 10:21:34 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1657362095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VehBBTdtPA0tfug4qnKtR5Xk6IJFNP0vJDbcNALj5Wk=; b=ZGbbUY7z6myh5RuLoPtdfHseQgcC9Fxcq1S6BspekJbeYHaz2mZdB/ULGayyWdg4fLSAHJ SK0+/QXsQyBdhvDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1657362095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VehBBTdtPA0tfug4qnKtR5Xk6IJFNP0vJDbcNALj5Wk=; b=W1OBM3l+qxF5oSApeh1wcnU1VKAzimiNptaBG5JBxJqiing2jI4Cnp1v9pvxEDomIo9DHE DxWCmAACaeRiASOba6IQ9l08FDTWBb4Ml9lhNajJ1IK98/XkKLi0yT3HCJbJ+U2C0E1MCN X+F5+17rJUoO2BwzEj2Gs4fprF2+Z8edIDmLA7CbO5jxfl3OrE03eoQnD3IKDZEuivlPVQ SqNr8G1Blc4IAizOJ0TyOJLl9akYjpXTecPr86FItVzXQ+2G2B63iSoM7nV4Qn5ufZ4Yx8 Rp8iPPNHX0lL0KJkz6GsxAAs25SSDWB/2KKUIhyO/XzBvHkz51/YjNKUZUfrZQ== Message-ID: <232fb7fd-84cd-62c4-ffa0-261b3fa26f50@ipfire.org> Date: Sat, 9 Jul 2022 10:21:31 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH 1/2] backup.pl: Include logwatch summary into backups as well X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes: 12827 Signed-off-by: Peter Müller Reviewed-by: Adolf Belka --- config/backup/backup.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 7094ed610..762437321 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -191,7 +191,7 @@ restore_backup() { } find_logfiles() { - local filelist=( /var/log/messages* /var/log/*.log /var/log/**/*.log ) + local filelist=( /var/log/logwatch/* /var/log/messages* /var/log/*.log /var/log/**/*.log ) echo "${filelist[@]}" } From patchwork Sat Jul 9 10:21:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5735 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Lg5mS5yJYz3wwD for ; Sat, 9 Jul 2022 10:22:00 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Lg5mR60sdzyc; Sat, 9 Jul 2022 10:21:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Lg5mR5f74z2xyT; Sat, 9 Jul 2022 10:21:59 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Lg5mQ0jFxz2xyT for ; Sat, 9 Jul 2022 10:21:58 +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 ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Lg5mP2r88zqQ for ; Sat, 9 Jul 2022 10:21:57 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1657362118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cda2QK8Ns/4Dkksb9RGrYBKXbjLwkWJvpiWRAGJFkqM=; b=tVLRR8no3tbOZwepvTrGdmYBjT5MRdQhcR9UVXYwckcvXpmUhs1mKRIhr/tYcaDLH0IlIY JQSeuJNS7GtbW6AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1657362118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cda2QK8Ns/4Dkksb9RGrYBKXbjLwkWJvpiWRAGJFkqM=; b=QE0c33Tp5Wpp1MTQIW9geHx98hhXH/zG5vneW5cCuonBp7/9aApOMyAIJmfAhEcGWihNvj h+Ty0jpyTsiJCv6y/poF+D6GWJNH5Wnlz3Uq+beQBrl2pD5d8PL8jxllli1tbRlUZ1hrrx 7NK+PG+tW7JWQ2Rhl1DOmMVq4uuVM3bCgUq8jHDwZkYPVHVZRgDuSeEJgLZRRHbgbqvgEY lsjDtiQ2Do3SQGsgY7CVGQhmQHXByxvHvf/mO031uLlqnhLGCM3ScW1AyDdGxdR/63c3A0 k5xOp5wYdM5AZx/Y9I5drOHMrCYztsA6HdgZAJEDFh41TiPE56C8TQ2EPa/Zww== Message-ID: <21b0797b-cb3f-a342-1f01-04e04ff408fe@ipfire.org> Date: Sat, 9 Jul 2022 10:21:55 +0000 MIME-Version: 1.0 Subject: [PATCH 2/2] backup.pl: Delete directives for dropped OpenVPN convert script Content-Language: en-US To: development@lists.ipfire.org References: <232fb7fd-84cd-62c4-ffa0-261b3fa26f50@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <232fb7fd-84cd-62c4-ffa0-261b3fa26f50@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" See 0b6d12adae7f41bb31f6b361b2d6a90057de7867. Signed-off-by: Peter Müller Reviewed-by: Adolf Belka --- config/backup/backup.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 762437321..54957a814 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -157,9 +157,6 @@ restore_backup() { # Reload firewall firewallctrl - # Convert old OpenVPN CCD files (CN change, Core Update 75) - convert-ovpn - # Snort to suricata converter. if [ -d "/var/ipfire/snort" ]; then # Run converter