diff --git a/.gitattributes b/.gitattributes index cee1761..4465783 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ files/sasl_passwd filter=git-crypt diff=git-crypt +files/borgmatic.yaml filter=git-crypt diff=git-crypt diff --git a/files/borgmatic.yaml b/files/borgmatic.yaml new file mode 100644 index 0000000..217b4d8 Binary files /dev/null and b/files/borgmatic.yaml differ diff --git a/templates/borgmatic.yaml.j2 b/files/borgmatic.yaml_clear similarity index 84% rename from templates/borgmatic.yaml.j2 rename to files/borgmatic.yaml_clear index 2c037f0..ea5dfe5 100644 --- a/templates/borgmatic.yaml.j2 +++ b/files/borgmatic.yaml_clear @@ -4,7 +4,7 @@ location: one_file_system: false repositories: - - quv7z6k8@quv7z6k8.repo.borgbase.com:repo + - exclude_patterns: - ~/*/.cache @@ -14,7 +14,7 @@ location: storage: compression: auto,zstd - encryption_passphrase: '{{ host.data.borg_passphrase }}' + encryption_passphrase: '' archive_name_format: '{hostname}-{now}' retention: @@ -43,4 +43,4 @@ hooks: after_backup: - echo "`date` - Finished backup" - healthchecks: {{ host.data.borg_healthchecks }} + healthchecks: diff --git a/group_data/all.py b/group_data/all.py index 7dc06cf..db762fa 100644 --- a/group_data/all.py +++ b/group_data/all.py @@ -6,12 +6,6 @@ password = getpass('Please provide the secret password: ') def get_secret(crypted_value): 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$qCFfK9b1A2D-xf3oEJ5uwOt1r3QOm0DJGsi_hKKjk0Q=$Z0FBQUFBQmdVeFFnZ0c1SUhhSzNBQ3h3MzRxLXd1b1luSjl6NjcxdzdxdjBFU3pncG1jSVYySFNlV0dZdU5VaU0wRVkxSEJveU01RU9Oby1uU1U5dXExQXlKNG9xNmxMeDRfNW9tUXprSzVFaWFYdWlya0V0TmlWQ1ZDdk5JRUhrdVFXdW5LOFh4ODNnak1RcGJIOVI5SDFtN3g1T1pWMkh3PT0=') -borg_healthchecks = b_borg_healthchecks.decode('utf-8') - b_zfs_healthchecks = get_secret(b'1$2$Km9O6WZsSvCsvwcPxl0v27FXK6ZiI05OOThCLGmp0iI=$Z0FBQUFBQmdVVmRQS1F4SllzWWxkLU9UYjNQMXBaYmZIUFAxN0Q2dmh6S2M0ZHQwMUxra1R2aTZEbWVqeG9jRGZYeUtla1FncEFMMFc0VHg1ZXZoeDl6WWgzdUFMMHNiQ3J5Y1hmTzFXTlg4bVFGQjVUVndyNWt3VUZ2ZUI5OGU1UzlVQkhaSlFhc2pna3dCLTNzT051cGw0a1MyNWRqM1Z3PT0=') zfs_healthchecks = b_zfs_healthchecks.decode('utf-8') diff --git a/setup-backup.py b/setup-backup.py index 2c5b94a..cda6f93 100644 --- a/setup-backup.py +++ b/setup-backup.py @@ -51,7 +51,7 @@ if not host.fact.command('mount | grep databases || true'): files.template( name='Push borgmatic config', - src='templates/borgmatic.yaml.j2', + src='files/borgmatic.yaml', dest='/etc/borgmatic/config.yaml', mode='600', user='root',