From patchwork Sat Aug 31 18:52:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Koch X-Patchwork-Id: 2375 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 7D1E082F42 for ; Sat, 31 Aug 2019 18:53:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46LQTp3zJnz5CBhw; Sat, 31 Aug 2019 19:53:18 +0100 (BST) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46LQTp1Gkhz2ydT; Sat, 31 Aug 2019 18:53:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46LQTm3dK4z2ycw for ; Sat, 31 Aug 2019 18:53:16 +0000 (UTC) Received: from nx106.node02.secure-mailgate.com (nx106.node02.secure-mailgate.com [192.162.87.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 46LQTl6JQsz517Gs for ; Sat, 31 Aug 2019 19:53:15 +0100 (BST) Received: from dehamd003.servertools24.de ([31.47.254.18]) by node02.secure-mailgate.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1i48Uj-0003ek-P6 for development@lists.ipfire.org; Sat, 31 Aug 2019 20:53:09 +0200 Received: from starkstromlahn.spdns.org (dslb-002-205-038-221.002.205.pools.vodafone-ip.de [2.205.38.221]) by dehamd003.servertools24.de (Postfix) with ESMTPSA id 3DE27805C1 for ; Sat, 31 Aug 2019 20:52:58 +0200 (CEST) Received-SPF: pass (dehamd003.servertools24.de: connection is authenticated) From: Alex Koch To: development@lists.ipfire.org Subject: [PATCH 1/2] WUI log-section Mail: bugfix for dmi Date: Sat, 31 Aug 2019 20:52:59 +0200 Message-Id: <20190831185300.20508-1-ipfire@starkstromkonsument.de> X-PPP-Message-ID: <20190831185258.12042.21874@dehamd003.servertools24.de> X-PPP-Vhost: starkstromkonsument.de X-Originating-IP: 31.47.254.18 X-SecureMailgate-Domain: dehamd003.servertools24.de X-SecureMailgate-Username: 31.47.254.18 X-SecureMailgate-Outgoing-Class: ham X-SecureMailgate-Outgoing-Evidence: Combined (0.03) X-Recommended-Action: accept X-Filter-ID: Mvzo4OR0dZXEDF/gcnlw0duM4P579sYYbdH8Mt+sPVWpSDasLI4SayDByyq9LIhVxlgOTTqYlPNP GqxxdjraiUTNWdUk1Ol2OGx3IfrIJKywOmJyM1qr8uRnWBrbSAGDjJTO55kJBbv01x7dn2l3rPNh vhTXFC3uEZfNFh1aVkTnx8yeplRO3sLIqUlSH7OGgwQlfLKDebNdKeLBjrqvvYMlhcTgOXSCz8qb ysTVYVkaLnpCEJIWxWTJBf3FFLEmu3xsQHMYnlKQ9pcJ+5Uh0/FACMa4l/3pd4b5Oy6wVMG0HaDh DXN/mjGHOfSFZ+g8CzCvRwvqVEAQMkdN/mM3fI6jSvfpO+1kZkomjtjB6X7/nuj3koRhn2BlE7dX oT0pcbRIdQWM2NQMFh4QV224OAeB7iXwS+ET8xu8PinDjLaQeETIza2ISn5dEgBRzdTORAwX31WV Y5lWjWxuGSRuxWXf5NNoWqxwzT7YQb2bq3uDyiKr2bObCttBtO6VKDuO5YE5enyccp7RH4WQio3u GQOhzeGzw2pFTXtxL2RPdTQ0WClL7lPySiyMTFKyJyozybxQmwA+8NxVIq0MJiSKg9jlDHh8k6TT dHl8m1/8O/92QjNLubgZSlcJjVjePeKVzS9GD/IKkRDV2QGlthfHXZ7z1zrJl+/Ib2y8TSiQx4AD 5b6O3kNlsKIoCFAaHMxANFKI/pMMfu3Czprl2h+uLKzL2SfQG0dSP4FuiPfFINA+p/Z3NcHxDVIt hQj36LyC1x66Qw3T0UFAji0c5knCvGgNninNOnp9XbMRwMwWrv3zxYP9kzBy945btFBHxykDy3BH QTsHg9ZZ+vQS6KwWvXxy1vnrA61yVPRg9sECH29VLny8B/olhO+afHUXINbW0sEmtoqhLjbEtkj9 CuDQRUFlf+gWT7v14rJm2E3PGsbtxOzzT/YWdmD8gywgB151eyyFY8GlmzRmIAOnS+GEXwEKaipO awN0AgJAg/KPUJM4l8rbNA7wj6QG1FXuXiK7N6LaNLb3lhm5MX4VrSl93jbiT9tkDxmwwn3e/+d7 cvas+yPoAIIlCTgNeJ6BI6ZW8USH3dGwLkG46rflwqVsACGdtrRMVGrTPw8oVQPCiJ8= X-Report-Abuse-To: spam@node01.secure-mailgate.com Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfire@starkstromkonsument.de designates 192.162.87.106 as permitted sender) smtp.mailfrom=ipfire@starkstromkonsument.de X-Rspamd-Queue-Id: 46LQTl6JQsz517Gs X-Spamd-Result: default: False [-4.45 / 11.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:192.162.87.0/24]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[starkstromkonsument.de]; MX_GOOD(-0.01)[mail.starkstromkonsument.de]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-2.13)[-0.709,0]; IP_SCORE(-0.02)[country: DE(-0.08)]; FROM_EQ_ENVFROM(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[106.87.162.192.list.dnswl.org:server fail]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:45031, ipnet:192.162.84.0/22, country:DE]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[221.38.205.2.zen.spamhaus.org : 127.0.0.11] X-Rspamd-Server: mail01.i.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" The prefix for dmi in /var/log/mail seems to have changed from "dmi[]: " to "dmi: ". This results in a bug where no lines are being shown at all in the WUI. Signed-off-by: Alex Koch Signed-off-by: Michael Tremer --- html/cgi-bin/logs.cgi/log.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 061525382..98b09041a 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -57,7 +57,7 @@ my %sections = ( 'cron' => '(fcron\[.*\]: )', 'ddns' => '(ddns\[\d+\]:)', 'dhcp' => '(dhcpd: )', - 'dma' => '(dma\[.*\]: )', + 'dma' => '(dma: |dma\[.*\]: )', 'guardian' => '(guardian\[.*\]: )', 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )', From patchwork Sat Aug 31 18:53:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Koch X-Patchwork-Id: 2376 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 6FE3C82F42 for ; Sat, 31 Aug 2019 18:53:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 46LQTv53Vnz5DZjT; Sat, 31 Aug 2019 19:53:23 +0100 (BST) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 46LQTv2rv4z2yhS; Sat, 31 Aug 2019 18:53:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46LQTt0DHrz2ydL for ; Sat, 31 Aug 2019 18:53:22 +0000 (UTC) Received: from nx102.node02.secure-mailgate.com (nx102.node02.secure-mailgate.com [192.162.87.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 46LQTq5lZkz5DZj9 for ; Sat, 31 Aug 2019 19:53:19 +0100 (BST) Received: from dehamd003.servertools24.de ([31.47.254.18]) by node02.secure-mailgate.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1i48Uj-0003el-P6 for development@lists.ipfire.org; Sat, 31 Aug 2019 20:53:13 +0200 Received: from starkstromlahn.spdns.org (dslb-002-205-038-221.002.205.pools.vodafone-ip.de [2.205.38.221]) by dehamd003.servertools24.de (Postfix) with ESMTPSA id 4D6C2805C8 for ; Sat, 31 Aug 2019 20:52:58 +0200 (CEST) Received-SPF: pass (dehamd003.servertools24.de: connection is authenticated) From: Alex Koch To: development@lists.ipfire.org Subject: [PATCH 2/2] WUI log-section Mail: add support for postfix addon Date: Sat, 31 Aug 2019 20:53:00 +0200 Message-Id: <20190831185300.20508-2-ipfire@starkstromkonsument.de> In-Reply-To: <20190831185300.20508-1-ipfire@starkstromkonsument.de> References: <20190831185300.20508-1-ipfire@starkstromkonsument.de> X-PPP-Message-ID: <20190831185258.12047.12961@dehamd003.servertools24.de> X-PPP-Vhost: starkstromkonsument.de X-Originating-IP: 31.47.254.18 X-SecureMailgate-Domain: dehamd003.servertools24.de X-SecureMailgate-Username: 31.47.254.18 X-SecureMailgate-Outgoing-Class: ham X-SecureMailgate-Outgoing-Evidence: Combined (0.02) X-Recommended-Action: accept X-Filter-ID: Mvzo4OR0dZXEDF/gcnlw0duM4P579sYYbdH8Mt+sPVWpSDasLI4SayDByyq9LIhVFvmu28rhqyDS 1Q/JPtyFFkTNWdUk1Ol2OGx3IfrIJKywOmJyM1qr8uRnWBrbSAGDjJTO55kJBbv01x7dn2l3rPNh vhTXFC3uEZfNFh1aVkTnx8yeplRO3sLIqUlSH7OGtI3dJ/FnTWho0phDgi/Ed4MlhcTgOXSCz8qb ysTVYVkaLnpCEJIWxWTJBf3FFLEmu3xsQHMYnlKQ9pcJ+5Uh0/FACMa4l/3pd4b5Oy6wVMG0HaDh DXN/mjGHOfSFZ+g8CzCvRwvqVEAQMkdN/mM3fI6jSvfpO+1kZkomjtjB6X7/nuj3koRhn2BlE7dX oT0pcbRIdQWM2NQMFh4QV224OAeB7iXwS+ET8xu8PinDjLaQeETIza2ISn5dEgBRzdTORAwX31WV Y5lWjWxuGSRuxWXf5NNoWqxwzT7YQb2bq3uDyiKr2bObCttBtO6VKDuO5YE5enyccp7RH4WQio3u GQOhzeGzw2pFTXtxL2RPdTQ0WClL7lPySiyMTFKyJyozybxQmwA+8NxVIq0MJiSKg9jlDHh8k6TT dHl8m1/8O/92QjNLubgZSlcJjVjePeKVzS9GD/IKkRDV2QGlthfHXZ7z1zrJl+/Ib2y8TSiQx4Bh Ptki+ibmKYedT0euUQrykOWdrC/IcFbu7ZBZgunEkazL2SfQG0dSP4FuiPfFINA+p/Z3NcHxDVIt hQj36LyC1x66Qw3T0UFAji0c5knCvGgNninNOnp9XbMRwMwWrv3zxYP9kzBy945btFBHxykDy3BH QTsHg9ZZ+vQS6KwWvTkAQZiEgi/tv3MnkUCU8RNVLny8B/olhO+afHUXINbW0sEmtoqhLjbEtkj9 CuDQRUFlf+gWT7v14rJm2E3PGsbtxOzzT/YWdmD8gywgB151eyyFY8GlmzRmIAOnS+GEXwEKaipO awN0AgJAg/KPUJM4l8rbNA7wj6QG1FXuXiK7N6LaNLb3lhm5MX4VrSl93jbiT9tkDxmwwn3e/+d7 cvas+yPoAIIlCTgNeJ6BI6ZW8USH3dGwLkG46rflwqVsACGdtrRMVGrTPw8oVQPCiJ8= X-Report-Abuse-To: spam@node01.secure-mailgate.com Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfire@starkstromkonsument.de designates 192.162.87.102 as permitted sender) smtp.mailfrom=ipfire@starkstromkonsument.de X-Rspamd-Queue-Id: 46LQTq5lZkz5DZj9 X-Spamd-Result: default: False [-4.43 / 11.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:192.162.87.0/24]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[starkstromkonsument.de]; MX_GOOD(-0.01)[cached: mail.starkstromkonsument.de]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-2.10)[-0.702,0]; RECEIVED_SPAMHAUS_PBL(0.00)[221.38.205.2.zen.spamhaus.org : 127.0.0.11]; IP_SCORE(-0.02)[country: DE(-0.08)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:45031, ipnet:192.162.84.0/22, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[99.99%]; RCVD_IN_DNSWL_FAIL(0.00)[102.87.162.192.list.dnswl.org:server fail] X-Rspamd-Server: mail01.i.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" Expand the regex for the section dmi ("Mail") for /var/log/mail to include the log contents of postfix, in case the addon is installed. Signed-off-by: Alex Koch Signed-off-by: Michael Tremer --- html/cgi-bin/logs.cgi/log.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 98b09041a..ebbc3f8cd 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -57,7 +57,7 @@ my %sections = ( 'cron' => '(fcron\[.*\]: )', 'ddns' => '(ddns\[\d+\]:)', 'dhcp' => '(dhcpd: )', - 'dma' => '(dma: |dma\[.*\]: )', + 'dma' => '(dma: |dma\[.*\]: |postfix/\w*\[\d*\]: )', 'guardian' => '(guardian\[.*\]: )', 'ipfire' => '(ipfire: )', 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',