From fa4fe511557a11a06efe6999f30f65989408089c Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 6 Jun 2021 08:05:41 +0200 Subject: [PATCH] bundles/backup-client: do logging --- bundles/backup-client/files/logrotate.conf | 10 ++++++++++ bundles/backup-client/items.py | 6 ++++++ bundles/backup-client/metadata.py | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 bundles/backup-client/files/logrotate.conf diff --git a/bundles/backup-client/files/logrotate.conf b/bundles/backup-client/files/logrotate.conf new file mode 100644 index 0000000..cd23372 --- /dev/null +++ b/bundles/backup-client/files/logrotate.conf @@ -0,0 +1,10 @@ +/var/log/backup-client/*.log { + compress + copytruncate + daily + dateext + missingok + notifempty + rotate 14 + sharedscripts +} diff --git a/bundles/backup-client/items.py b/bundles/backup-client/items.py index a0684ef..f816855 100644 --- a/bundles/backup-client/items.py +++ b/bundles/backup-client/items.py @@ -47,10 +47,16 @@ files['/usr/local/share/icinga/plugins/check_backup_last_run'] = { 'mode': '0755', } +files['/etc/logrotate.d/backup-client'] = { + 'source': 'logrotate.conf', +} + directories['/etc/backup-pre-hooks.d'] = { 'purge': True, } +directories['/var/log/backup-client'] = {} + for hname, hcontent in node.metadata.get('backup-client/pre-hooks', {}).items(): files[f'/etc/backup-pre-hooks.d/50-{hname}'] = { 'content': '#!/bin/sh\n\n' + hcontent, diff --git a/bundles/backup-client/metadata.py b/bundles/backup-client/metadata.py index ddbe3cd..9762f96 100644 --- a/bundles/backup-client/metadata.py +++ b/bundles/backup-client/metadata.py @@ -19,7 +19,7 @@ def cron(metadata): return { 'cron': { - 'backup': '{} 23 * * * root /usr/local/bin/generate-backup > /dev/null 2>&1'.format( + 'backup': '{} 23 * * * root /usr/local/bin/generate-backup > /var/log/backup-client/backup.log 2>&1'.format( (node.magic_number % 60), ), },