Add logwatch maillog.conf file to support /var/log/mail/ by andrewlow · Pull Request #2112 · docker-mailserver/docker-mailserver

andrewlow · 2021-08-04T17:14:27Z

Description

Create a new target/logwatch file tree.
Add a maillog.conf file that configures logwatch to look in the /var/log/mail/* path
Modify Dockerfile to pull from this target and place in the appropriate /etc/logwatch location

Fixes #2108

Type of change

Improvement (non-breaking change that does improve existing functionality)

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation (README.md or the documentation under docs/)
If necessary I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes

casperklein · 2021-08-05T13:09:10Z

+*ExpandRepeats
+
+# Keep only the lines in the proper date range...
+*ApplyStdDate


Is the '*' a typo?

These come directly from the /usr/share/logwatch/default.conf/logfiles/maillog.conf file

To create the maillog.conf file that is in my PR is a modified version of the original.

I understand. I would remove the comments on the top, because THIS file isn't maintained Kenneth 😉

I guess /usr/share/logwatch/default.conf/logfiles/maillog.conf is read first and extended/overwritten by the local changes made in /etc/logwatch/conf/logfiles/maillog.conf. That said, are the four lines at the end necessary (Line 26-30)?

Oops.. yeah - I should have removed the comment at the top.

I've now reviewed the doc on logwatch http://www.stellarcore.net/logwatch/tabs/docs/HOWTO-Customize-LogWatch.html - and better understand the way to customize it.

Very good review - thank you.

I've tested it and it seems to work 👍 The daily logwatch mail went from ~60KB to 170KB.

FWIW - I've been running with this change as well for days now.

It is also possible to test this by shelling into the container

docker exec -it mailserver bash logwatch --range Yesterday

If you have an existing mail server container that has been running for more than 1 day (because until you have a logrotate happen, the problem doesn't manifest itself) - then you can test things being broken.

Then by adding the /etc/logwatch/conf/logfiles/maillog.conf file - testing again, will result in a complete logwatch showing email that is in the /var/log/mail/mail.log.1 file.

If you have an existing mail server container that has been running for more than 1 day

fyi: The (rotated) logs are kept during container restarts (if you use the default docker-compose.yml)

Agree - a new installation with no rotations (ever) would not have a /var/log/mail/mail.log.1 file.

I should have been more precise that you need to have data in a /var/log/mail/mail.log.1 file to test in a sane way.

casperklein · 2021-08-05T13:11:13Z

Would just an additional symlink also work?

/var/log/mail.log.1 -> /var/log/mail/mail.log.1

andrewlow · 2021-08-05T14:12:29Z

An additional symlink might work most of the time. Especially with the default 'Yesterday' logwatch parameter.

There are additional archive files which the maillog.conf file specifies, which would not be found.

# ls /var/log/mail
clamav.log       clamav.log.3.gz  freshclam.log.2.gz  mail.err.1   mail.info.2.gz  mail.log.1     mail.log.4.gz  mail.warn.2.gz
clamav.log.1     freshclam.log    freshclam.log.3.gz  mail.info    mail.info.3.gz  mail.log.2.gz  mail.warn      mail.warn.3.gz
clamav.log.2.gz  freshclam.log.1  mail.err            mail.info.1  mail.log        mail.log.3.gz  mail.warn.1

Adding target/logwatch opens up the possibility to add additional logwatch configurations.

casperklein · 2021-08-06T15:09:15Z

If nobody complains, I'll merge this in 1-2 days.

georglauterbach · 2021-08-06T15:36:37Z

LGTM

georglauterbach · 2021-08-06T15:38:30Z

#2109 should be merged first though @casperklein :)

casperklein · 2021-08-06T15:39:46Z

Haha. JUST thought the same. You were some seconds faster.

georglauterbach · 2021-08-10T20:33:57Z

This should be merged tomorrow, 11th August, when the pipelines for the v10.1.0 release finish successfully.

wernerfred · 2021-08-10T20:53:50Z

This should be merged tomorrow, 11th August, when the pipelines for the v10.1.0 release finish successfully.

assuming the fact that the major outage is fixed soon 🚀 https://www.githubstatus.com/

georglauterbach · 2021-08-11T07:49:50Z

This should be merged tomorrow, 11th August, when the pipelines for the v10.1.0 release finish successfully.

assuming the fact that the major outage is fixed soon 🚀 https://www.githubstatus.com/

All systems are operational again. I will merge this when all tests have passed.

wernerfred · 2021-08-11T11:16:34Z

@all-contributors add @andrewlow for code

allcontributors · 2021-08-11T11:16:42Z

@wernerfred

I've put up a pull request to add @andrewlow! 🎉

andrewlow · 2021-08-11T12:53:28Z

Thanks for all the work on this project - it's been a pleasure to participate.

Add logwatch maillog.conf file to support /var/log/mail/

b6c3140

andrewlow mentioned this pull request Aug 4, 2021

Weird Dovecot login failures for emails arriving to a virtual alias #2091

Closed

casperklein reviewed Aug 5, 2021

View reviewed changes

Simpliied after reviewing logwatch doc

8d0dbf8

casperklein approved these changes Aug 6, 2021

View reviewed changes

georglauterbach approved these changes Aug 6, 2021

View reviewed changes

casperklein added this to the v10.1.1 milestone Aug 6, 2021

wernerfred added the meta/feature freeze On hold due to upcoming release process label Aug 7, 2021

georglauterbach added area/features kind/improvement Improve an existing feature, configuration file or the documentation priority/low and removed meta/feature freeze On hold due to upcoming release process labels Aug 10, 2021

Merge branch 'master' into fix-logwatch

ac5649f

georglauterbach merged commit 0e9c988 into docker-mailserver:master Aug 11, 2021

allcontributors Bot mentioned this pull request Aug 11, 2021

docs: add andrewlow as a contributor for code #2117

Merged

Uh oh!

Conversation

andrewlow commented Aug 4, 2021

Description

Type of change

Checklist:

Uh oh!

casperklein Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

andrewlow Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

casperklein Aug 5, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrewlow Aug 6, 2021

Choose a reason for hiding this comment

Uh oh!

casperklein Aug 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andrewlow Aug 6, 2021

Choose a reason for hiding this comment

Uh oh!

casperklein Aug 6, 2021

Choose a reason for hiding this comment

Uh oh!

andrewlow Aug 6, 2021

Choose a reason for hiding this comment

Uh oh!

casperklein commented Aug 5, 2021

Uh oh!

andrewlow commented Aug 5, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

casperklein commented Aug 6, 2021

Uh oh!

georglauterbach commented Aug 6, 2021

Uh oh!

georglauterbach commented Aug 6, 2021

Uh oh!

casperklein commented Aug 6, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

georglauterbach commented Aug 10, 2021

Uh oh!

wernerfred commented Aug 10, 2021

Uh oh!

georglauterbach commented Aug 11, 2021

Uh oh!

wernerfred commented Aug 11, 2021

Uh oh!

allcontributors Bot commented Aug 11, 2021

Uh oh!

andrewlow commented Aug 11, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

casperklein Aug 5, 2021 •

edited

Loading

casperklein Aug 6, 2021 •

edited

Loading

andrewlow commented Aug 5, 2021 •

edited

Loading

casperklein commented Aug 6, 2021 •

edited

Loading