From d9e0c6d6becf2c82c47e1a7f9e2655ec6fe84554 Mon Sep 17 00:00:00 2001 From: Benoit S Date: Mon, 1 Feb 2021 19:31:54 +0900 Subject: [PATCH] Add Healtchecks --- group_data/all.py | 7 +++++-- setup-zfs-and-lxd.py | 19 ------------------- templates/borgmatic.yaml.j2 | 3 +++ 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/group_data/all.py b/group_data/all.py index 57c4aac..ed0be53 100644 --- a/group_data/all.py +++ b/group_data/all.py @@ -2,9 +2,12 @@ from getpass import getpass import privy -def get_secret(borg_passphrase): +def get_secret(crypted_value): password = getpass('Please provide the secret password: ') - return privy.peek(borg_passphrase, password) + return privy.peek(crypted_value, password) b_borg_passphrase = get_secret(b'1$2$o9juQh0wvpWhOsXHhh-xyimKIpWAUOk9MgLeSHiM_NA=$Z0FBQUFBQmdGb3U0RmNfaDdYYkVfU1pvdW9SbXFJMC1GN2FsSXJoTVpkVENaRlN1V2ZiOVNpalk2Z28zS3R5bFRWMkh3VnQ4cFhIZVhtWVphWDhwQi00ejJsWS1pMkZMSGhvTnlVTi15aTBLejdTTHVjdGZLYUtqRUY0Wm9Lc19ISTZ3Wkc1SHJFLWNIMUNtekFXMzFBV1BMN1hNZlludG5xMU9WdkNPM3lwaDZfWFpESExaVHdFPQ==') borg_passphrase = b_borg_passphrase.decode('utf-8') + +b_borg_healthchecks = get_secret(b'1$2$AbHQ2WFelnJfIi5SjEtgAugd3xHSJDfikh0RBV3QY80=$Z0FBQUFBQmdGOWdKZnp1d3B0YUJUck9kOVNBVWxTRjJZZnpubUZmNmV0cmlCUm9kLUhYNndqWkhMOG5WQU44ZUVMQ2lEdW1jLUhSOTJub0VMZWFWdHBBb0JKdVptanNCQ2xyQXQ2cEdfMjBaUy00Y2dlcnJzc1ViaE5sQ0RUUS1idkViQ0hOOWdRWUlqZElQSlAzYmpjSUl5bjNuTDhDLTNBPT0=') +borg_healthchecks, = b_borg_healthchecks.decode('utf-8') diff --git a/setup-zfs-and-lxd.py b/setup-zfs-and-lxd.py index 599f4a6..057083b 100644 --- a/setup-zfs-and-lxd.py +++ b/setup-zfs-and-lxd.py @@ -92,22 +92,3 @@ if not host.fact.command('lxc storage volume list default | grep images || true' commands=['lxc storage volume create default images', 'lxc config set storage.images_volume default/images'] ) -files.directory( - name='Ensure /var/backups/lxd exists', - path='/var/backups/lxd', - user='root', - group='root', - mode=700 -) - -if not host.fact.command('zfs list | grep exports || true'): - server.shell( - name='Create ZFS volume exports', - commands=['zfs create local/exports -o mountpoint=/var/backups/lxd'] - ) - -server.shell( - name='Mount local/exports', - commands=['zfs mount local/exports'], -) - diff --git a/templates/borgmatic.yaml.j2 b/templates/borgmatic.yaml.j2 index 84acf60..5f55c8e 100644 --- a/templates/borgmatic.yaml.j2 +++ b/templates/borgmatic.yaml.j2 @@ -37,6 +37,9 @@ hooks: # List of one or more shell commands or scripts to execute before creating a backup. before_backup: - echo "`date` - Starting backup" + - /usr/local/bin/lxd-export.sh after_backup: - echo "`date` - Finished backup" + + healthchecks: {{ host.data.borg_healthchecks }}