From 5df546754fb96c40b4087ecb7330b55a0258103a Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 9 Jan 2022 08:23:59 +0100 Subject: [PATCH 1/2] bundles/pacman: fix install_gui package definition --- bundles/pacman/items.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/pacman/items.py b/bundles/pacman/items.py index e0a116c..38d86de 100644 --- a/bundles/pacman/items.py +++ b/bundles/pacman/items.py @@ -79,7 +79,7 @@ pkg_pacman = { } if node.metadata.get('pacman/install_gui', False): - pkg_pacman = { + pkg_pacman.update({ 'fish': {}, 'netctl': {}, 'rfkill': {}, From 5b2e5fc8388c7ed64e34936f328ca6550184f04f Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sun, 9 Jan 2022 08:26:08 +0100 Subject: [PATCH 2/2] bundles/backup-server: do not alert for one missing day of backups --- bundles/backup-server/files/check_backup_for_node | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bundles/backup-server/files/check_backup_for_node b/bundles/backup-server/files/check_backup_for_node index e983f14..187d5d4 100644 --- a/bundles/backup-server/files/check_backup_for_node +++ b/bundles/backup-server/files/check_backup_for_node @@ -42,9 +42,12 @@ try: datetime.fromtimestamp(last_snap).strftime('%Y-%m-%d %H:%M:%S'), )) - if delta > (DAY_SECONDS * 2): + # One day without backups is still okay. There may be fluctuations + # because of transfer speed, amount of data, changes in backup + # schedule etc. + if delta > (DAY_SECONDS * 3): exit(2) - elif delta > DAY_SECONDS: + elif delta > (DAY_SECONDS * 2): exit(1) else: exit(0)