From 56f95ddf97b2c0a38cc3bc2235015ed6f6900afd Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Wed, 23 Feb 2022 16:18:06 -0800 Subject: [PATCH] email: rspamd: Log to journald via syslog Unified querying, reduce random writes for SD cards, eliminate need for separate log rotation. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .../email/data/etc/rspamd/local.d/freedombox-logging.inc | 1 + plinth/modules/email/privileged/spam.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 plinth/modules/email/data/etc/rspamd/local.d/freedombox-logging.inc diff --git a/plinth/modules/email/data/etc/rspamd/local.d/freedombox-logging.inc b/plinth/modules/email/data/etc/rspamd/local.d/freedombox-logging.inc new file mode 100644 index 000000000..d342720b0 --- /dev/null +++ b/plinth/modules/email/data/etc/rspamd/local.d/freedombox-logging.inc @@ -0,0 +1 @@ +type=syslog diff --git a/plinth/modules/email/privileged/spam.py b/plinth/modules/email/privileged/spam.py index f2ba735e8..a2f8bbc8d 100644 --- a/plinth/modules/email/privileged/spam.py +++ b/plinth/modules/email/privileged/spam.py @@ -40,7 +40,8 @@ def _compile_sieve(): def _setup_rspamd(): """Adjust configuration to include FreedomBox configuration files.""" configs = [('milter_headers.conf', 'freedombox-milter-headers.conf'), - ('redis.conf', 'freedombox-redis.conf')] + ('redis.conf', 'freedombox-redis.conf'), + ('logging.inc', 'freedombox-logging.inc')] base_path = pathlib.Path('/etc/rspamd/local.d') for orig_path, include_path in configs: _setup_local_include(base_path / orig_path, base_path / include_path)