From aaff2eebcff895afe335740ec2122270bac11ccb Mon Sep 17 00:00:00 2001 From: downtownallday Date: Sat, 7 Jan 2023 20:36:04 -0500 Subject: [PATCH] setup: copy custom logwatch services and conf, if available --- setup/mods.available/logwatch.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup/mods.available/logwatch.sh b/setup/mods.available/logwatch.sh index 8f0b9fd8..ffd3db05 100755 --- a/setup/mods.available/logwatch.sh +++ b/setup/mods.available/logwatch.sh @@ -27,7 +27,8 @@ logwatch_remove() { logwatch_install() { echo "Installing logwatch" - apt_install logwatch + # also install some perl modules used by our nextcloud logfilter + apt_install logwatch libjson-perl libtry-tiny-perl # remove cron entry added by logwatch installer, which emails daily rm -f /etc/cron.daily/00logwatch mkdir -p /var/cache/logwatch @@ -50,6 +51,11 @@ logwatch_install() { ) fi + # install our custom logwatch filters + if [ -d setup/mods.available/conf/logwatch ]; then + cp -R setup/mods.available/conf/logwatch/* /etc/logwatch/ + fi + tools/editconf.py /etc/logwatch/conf/logwatch.conf -case-insensitive "${settings[@]}" install_hook_handler "setup/mods.available/hooks/logwatch-hooks.py" }