The prefix for dmi in /var/log/mail seems to have changed from "dmi[<PID>]: " to "dmi: ". This results in a bug where no lines are being shown at all in the WUI.
Signed-off-by: Alex Koch ipfire@starkstromkonsument.de --- 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: )',
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 ipfire@starkstromkonsument.de --- 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: )',
Likewise!
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
On 31 Aug 2019, at 19:53, Alex Koch ipfire@starkstromkonsument.de wrote:
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 ipfire@starkstromkonsument.de
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: )',-- 2.17.1
That change looks good to me!
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
On 31 Aug 2019, at 19:52, Alex Koch ipfire@starkstromkonsument.de wrote:
The prefix for dmi in /var/log/mail seems to have changed from "dmi[<PID>]: " to "dmi: ". This results in a bug where no lines are being shown at all in the WUI.
Signed-off-by: Alex Koch ipfire@starkstromkonsument.de
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: )',-- 2.17.1
-
Alex Koch -
Michael Tremer