From 13f3ccf78da2836db08b33923b4f4350ebae9800 Mon Sep 17 00:00:00 2001
From: Benoit S <git@benpro.fr>
Date: Sat, 4 Sep 2021 21:34:37 +0900
Subject: [PATCH] Move borgmatic template to a git-crypt file

---
 .gitattributes                                   |   1 +
 files/borgmatic.yaml                             | Bin 0 -> 1152 bytes
 .../borgmatic.yaml_clear                         |   6 +++---
 group_data/all.py                                |   6 ------
 setup-backup.py                                  |   2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 files/borgmatic.yaml
 rename templates/borgmatic.yaml.j2 => files/borgmatic.yaml_clear (84%)

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 0000000000000000000000000000000000000000..217b4d80979e60dd82d6f3c6c3f1c92ec509517d
GIT binary patch
literal 1152
zcmV-`1b_PgM@dveQdv+`07p3Ze0#2Hf?u;g|9aDlP!lHy)`MT$VEg%-sf7*rgk+*o
z7&%PglO19``GLWSO+u7b`Kj<LEVJ4fX=e&3V?^^aWZ-)Wt3r{mUIyiI5C%pk2ui~l
zzM)gIU4bBidD3{55XAUn1(kzX6^p1ZIR=luvwMg4{jFx2%ng${xVQvd_hD{@q(Wcp
z%YtgjlMxk+-bz~V^c%aKb>0E;+M(~9F$+j;5jZzB4{yL;-luWx)`+3Yk=L62Z*yMt
zsf&AnE~R@uPwAwwz2YI(s6Rp<dIlu+Ow+HXcjR0v>1_EfsNQbaR1r61`CO5$KKKGm
zGKm)o%`3HQw1dXyGG|o=+K*4hlYT9?M%n0%3WYePux5?QecJOduu--r%&c&z8TrJB
zo!I3pY4gUqre>D}8za15RNSqR-|$RMQnnH#e#KZg6oJ9Q%~qqLK9~pWB9c=dlIoXn
z7pisWq;f2WBR+4ycwX$kpH_Tg0$}z(Z0`%*rC}N>YhBiEhG;Ctp#dZtmih!*@MKY$
z4k_pOqL)^j@7UV_PZ{1iYzJqLlEPZ?n@S`f8=ytFwBe|+&bA_IyVvP!IGjp`n@P-s
z-a2jVf9XF(jv|@(I5F*V51x1<CH^QPg?vmkA?{0)2mVVAKx(Fx)Q*wOTQ<KWUWwSY
z&z_DIfYm}ZAtq-bTSv5<#i8@oqL|Z@&ydhio$zV)#IcL8C{-1F0~dca6UWlq{BKVU
zRDU&b^X#$_wsK8L99sOO2VuFt4E4I^jxl7*SO`*q4*}P{+-;2<eAWnFRP-}%i5Vfd
zXme#!ay-|YtVe{jy8sq|9=oai6~3jRxR;vDGn*PeiZO2`guQ;|<#g79p=F#Jgi@S*
zRAlvF>;#i34m1;MX&&>*Eu1)RG=?d*b>^hptx4?jJ-QY!;G|>Orov7x7td~rwUa&N
z;in_H5=rxX7abDm0*)F<u@@=*X&AMNM9Jpu=9-5>#eX4KGTgy^hfi8P#yMqk34SAZ
zVz9ZE^KB2#LZvops(Jyn_cZdu@k)QJQRk}ow7yQ)8E&tS^RJ=m{&VxyUl%6NQUl@X
z-j_UQTuIj<i?Va62;Jdh1A0c>#WNL`ixgxWuR9}c6f}9Kzkxg0z<VUxMD$<?m&8I+
zv}xw^;|TIrsx`LG%iVr?g*uc%ma5B!Y}KHw_wC7kgciCOzx<Ab#N!Sn@2uRbimCf}
zfHDkJ1Ri}%1;G*#nFqE}YbZ<uhBuU?Pa&*6etEm}hXb#*2+tsE?IhS5P)u6lLT5Z8
z+hEpkSg_%8HgZ3TA<6Dy?ip|(AG8Q@|Dw6O(n&KwFnhvNk(!U+MBL{SESSJz>V+td
zF{fQ>`k}$wIDNVx)OVVW7dgC8@W=793t55n33N<KIFr3`VPk8KyEdy_ArEa*xOKqj
z1Bs0@sYJeybc_6Nk%&`MMGXV!7CU!Tpyw?sbHlCoAzxOsNQdJx(-3ku;F6JDpoib}
Ss2%!MU`Y(#t(4LD1jTrlBRL8H

literal 0
HcmV?d00001

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
+        - <repo>
 
     exclude_patterns:
         - ~/*/.cache
@@ -14,7 +14,7 @@ location:
 
 storage:
     compression: auto,zstd
-    encryption_passphrase: '{{ host.data.borg_passphrase }}'
+    encryption_passphrase: '<passphrase>'
     archive_name_format: '{hostname}-{now}'
 
 retention:
@@ -43,4 +43,4 @@ hooks:
     after_backup:
         - echo "`date` - Finished backup"
 
-    healthchecks: {{ host.data.borg_healthchecks  }}
+    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',