From 628cc524a7b15250b55637e9ec8a2f0fe3595612 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Fri, 19 May 2023 20:40:14 +0200
Subject: [PATCH] hosts/web-2: migrate to clerie-backup

---
 .../restic-server-magenta-htpasswd.age        |  16 +++++++--------
 .../secrets/restic-server-cyan-htpasswd.age   | Bin 457 -> 518 bytes
 hosts/web-2/configuration.nix                 |  19 ++++--------------
 .../web-2/secrets/clerie-backup-job-main.age  | Bin 0 -> 508 bytes
 .../secrets/clerie-backup-target-cyan.age     | Bin 0 -> 531 bytes
 .../secrets/clerie-backup-target-magenta.age  |  10 +++++++++
 6 files changed, 22 insertions(+), 23 deletions(-)
 create mode 100644 hosts/web-2/secrets/clerie-backup-job-main.age
 create mode 100644 hosts/web-2/secrets/clerie-backup-target-cyan.age
 create mode 100644 hosts/web-2/secrets/clerie-backup-target-magenta.age

diff --git a/hosts/backup-4/secrets/restic-server-magenta-htpasswd.age b/hosts/backup-4/secrets/restic-server-magenta-htpasswd.age
index 4a43390..6f91706 100644
--- a/hosts/backup-4/secrets/restic-server-magenta-htpasswd.age
+++ b/hosts/backup-4/secrets/restic-server-magenta-htpasswd.age
@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 HwR33w DvxZZtfiAo7sl02P34DkqM0vRMsB8+8p7dlDPfbb6X8
-gJ13MIujNQrIunEJeO+n72qRtrZJddeioJnPWAJzbQ4
--> ssh-ed25519 eelCFw v0VghVmhBFmoH4OLazFHzaL1ga/D0+lJ0Ab5RnsSoBU
-6VbAhS69qRRll7wOVUtXGwb9/m6oIU4bxnVrKPVaYSI
--> z}t5`-grease )'hfU }]uDsGJi UG2|tq#
-a5gNJyJ1GIBqHxfWPHpLTsVgECEQWTx4NIiKVcMmXJiP318Tcw
---- G8lqnnB8mAWvoKQFwnIa48BNZkEgAhT7x5Urra99xSk
-dQ#gk�M���s%$F�6�:��̜���Uq���G�B�$�I�H$����6=�
��Pga�t-̘�'h�RA��]t��牂zp̚:L?k�!�]m����e��
\ No newline at end of file
+-> ssh-ed25519 HwR33w KzB2iwjuhj3RvlbIyQc/rku/NmRWKLDBVPslnIWpVzQ
+uIIZEkUSVe+vu2bhX9vy4khySCYFacnKDvMzO/Q0TRA
+-> ssh-ed25519 eelCFw ImV9bhBWFAuqKjsdyDaCDqwrBwccNvAXG99guRIgOi4
+MteXnPgTt67wMcyHlr9+nbge6SURmcfSPVbBmemC86M
+-> o+$`1fU-grease
+4fitm07i3fQvJbu//r1f880
+--- HxArr0hH/PE8KQP2tKv2nRbXyeU5dJYhFTeDkBD7RXM
+�������Eg�п��OFs�ց?��ij�h��e!K�G�)@9����d��.9�mP�R���s���9/�e~�45�U@.:�9_���Il�"\�P
\ No newline at end of file
diff --git a/hosts/clerie-backup/secrets/restic-server-cyan-htpasswd.age b/hosts/clerie-backup/secrets/restic-server-cyan-htpasswd.age
index 3339a8b474de2b0fa4bb36bf48a78791524709d8..4acaf0fb6a5503bde4e4642ced468159e6ddbda3 100644
GIT binary patch
delta 484
zcmV<A0UQ3w1BL{UEPq99c0y-nF+@{oD_L@FK{sS{dNOV@bwovIa&<IoX<AESW;jz%
zQ&2%{K?+qzV@fMSOHM0PZZKqYYGzJjXlPkWLQrHfZfr|tFKl{KNm5KhL|0QQV+t)k
zAaiqQEoEdfH8n9gAW2M6G(~qHM0s~%X+>#Nc5qs7b6Hn4D}PL4WmHslQ8aT;PG~QA
zD>+$7WmPX^G;~B!3Q0CtQ9&|TYH&A5Mln-RaadPWG(lxScuYuFM^sicP;78(YB6n6
zdSo|63N1b$T6-gVd^K5WEoX9NVRL05OipY=AR#edVhVXRMPoNmaAS5;Wk_*tP&7$P
zS$1z%L2XYqdVf_<I73QWcQ9s4d22B-Mr2x2Y;;6ZVoFj-a!*2aMMiOHM?-E3Ml&}-
zcUE<CR&!T5YAbL>bTemUG-ozyY<FdIb1+q5Lw5=-EiE8LH#T}%acnX}LrF_lM`cQA
zdT%*OYh_tec5H7nT3BskMp`*mOGia`S8oamh>u4NU|qlP3;TgSU~7>2Ln-C`c|wMB
zw7PL|g6SUX@}76uZy5Nwm=Gr<_n;h1u?qg5rBKaj+KL2z4bY!02z49*!60D10KeHK
aN5va#r$m&m;ghu7>5g?-_D`};0M(0$d#(2X

delta 423
zcmV;Y0a*Tq1jz%CEPqXDRCYH=L~=xML|JrIZB<ccc6fR#LN7^pQ&vK7Ge}2lY&dp7
zYBp9;I0`~nc~4O?SY=j5M_6Q4Rx3$0dP6TqN@h-SQ(-q*Sw}B4aBF5mNi$kbV+t)k
zAaiqQEoEdfH8n9gAW2M6G(~qHS}|BxaZou}Xfa1eG)+NdXn$EqPEa^9Qc){2LN;PX
zH!?yuMs0OiNMb`x3UW_qQA|ipa7$=;OHeUpOJZ<$b}(#WFGzK8IB`iudN4C_Yfv|7
zbx>kW3N1b$WO^-Ua%Ew2WeQYrS}RU%Pe@onb!1w0bZcQUPk1#-Lu+qQb5?jwZBBGy
zQY%?<cT8quM}J3CV_IqoEiEk|VpuCxM{-AUGj&>0D@s9nH8xd5PijJGc5PvEZACFL
zabr_>d23WqV^2*AQFndc!!TaZobXH|RU#?%r4-fsItKUTYEJ}s+u{RNPQ>T3ln9*d
z#_nMKyaKnm&K;|X2VzW1lPc7*E*mryO8SAF){ze&)F907l4-S`V05iUx@OvsN#n-T
ROOEOcfhtt<hpl60g@@~KoEHE9

diff --git a/hosts/web-2/configuration.nix b/hosts/web-2/configuration.nix
index 1420f2d..7a2db41 100644
--- a/hosts/web-2/configuration.nix
+++ b/hosts/web-2/configuration.nix
@@ -56,21 +56,10 @@
     package = pkgs.postgresql_12;
   };
 
-  services.borgbackup.jobs = {
-    main = {
-      paths = [
-        "/var/src"
-        "/var/lib"
-      ];
-      doInit = true;
-      repo =  "borg@backup.clerie.de:." ;
-      encryption = {
-        mode = "repokey-blake2";
-        passCommand = "cat /var/src/secrets/borg/main";
-      };
-      environment = { BORG_RSH = "ssh -i /var/src/secrets/ssh/borg-main"; };
-      compression = "auto,lzma";
-      startAt = "hourly";
+  clerie.backup = {
+    enable = true;
+    jobs.main = {
+      paths = [ "/var/lib" ];
     };
   };
 
diff --git a/hosts/web-2/secrets/clerie-backup-job-main.age b/hosts/web-2/secrets/clerie-backup-job-main.age
new file mode 100644
index 0000000000000000000000000000000000000000..45c9fde0fd9735e0dc6725d9a93c01ea86300963
GIT binary patch
literal 508
zcmZ9_O>dK6003a)Nzr5`ix*G0?V^Z)w3K;RQlL=2N`cX?s8J{s$|%tC@pgDHGucc`
zws`PvJn2Cb6R(>17rf1wT|F4R8E+=WtIr>JoWMu@WW3nRifNkMOcw!G5fHis=Xr?w
z-mPYn*o3>lAV~lhge~@FeZ&)GjGVZ>J_s$uHcFor8F63`sn}BH!CVm76!MHJT<mlr
zTitCWSzEJ(o}@Q)m)xy$CDj5J*t8>=x!{QZZ$y$HxDHDo<e5pqxT=?P%Ta`LdQS<(
zx(wPh%ji4!up;A$Q$-dHaTYytm43h8Ze?U(+dQVx6glJKCb0U;O-4&Afu*LjEYttC
zPBBM=h417({J?2lSLzg2sjc;Oxq{mP)UqeO)MGuP7P3$?r6j9scG%`6o*+CtAC?i&
z>zLzR(+V3PCPi88l*V?2NO9LfvJB#9({9SpB?uRN4g*%P9Lu;4p(qMtOa;`e%ZRRL
z^7B+h)LGV`IvN4kk+3vLRd8&(Q3MJzhVDIcy@!JS_~2yi%Ejj0cSma*E6TZz{qK=h
z{y4sR*8fnhzI9JOKL7RT&dW2c!Z;uOx%BPD1&sOnbmiJ;)!*lpFQ><^q``0c=K*zi
W^5k~%`Tpx0myh0b_YU8SpZ)@O>a5xT

literal 0
HcmV?d00001

diff --git a/hosts/web-2/secrets/clerie-backup-target-cyan.age b/hosts/web-2/secrets/clerie-backup-target-cyan.age
new file mode 100644
index 0000000000000000000000000000000000000000..914b016b1ffaab9f1af9012026430a9ca1cfc1f3
GIT binary patch
literal 531
zcmZ9_J&%)M003Z3V~qR)6QeeI)4g(Sfqpp{=>ercEA(0l3`QsvO5ue9<)f3MiHnQ5
zTXfZb;NWtJlhMTJbjeK@qlq~u<I)%}#`T^*@aVRMT5uW_VKNWkP7v9Zw1%Mf%5m(V
zmWkEtwRV}!hB%&;acZFVOhpZ&5R6sM6Wr8_EfVVrtZA=i8P*4hmJA%+?jb`l@JO2A
zASAmy&kUJ~Uu8mj5xXkQ^%!?=#f89;2q>xNw;F_?DwRFI2_YUP<H%!l&ad*5yyLkX
zONlIF%O=a@W~EDcd6rF)5j{)rwZ5l_`9k+v0+0n!fTj?el2FVgbFoNT+A@V}y!U@2
z%xOo8ZPbn|J+_dgHsf+}O5!vzRtiRwDL{3MZYvRdkksp{nb+hcmLyRnO^i+sOlFP&
zhl4T>Ouji}k)YZx44V?$b6zr9LYocTW<JXV3se-3^;cTd6oI5L^#(Z|*-WgBxJL1y
zqJS~SA}ETMRks}sdyNjo#%`z#W|T33tg^-omS%XO09oF}qin@%M26h@kp4K8FF)Qo
zx>?%YfAZ@fd~|Zn`Ey8JJl;Qe_VMh!bF}&XiG25M*Drn|o9)f@VCVSj+wCuJ1`5sH
nei@Wr^zT1(Pwu{oOIJ_-Ub*nwxN!#Vd_L?yeZJmGFTMT;;99)a

literal 0
HcmV?d00001

diff --git a/hosts/web-2/secrets/clerie-backup-target-magenta.age b/hosts/web-2/secrets/clerie-backup-target-magenta.age
new file mode 100644
index 0000000..50b8b6c
--- /dev/null
+++ b/hosts/web-2/secrets/clerie-backup-target-magenta.age
@@ -0,0 +1,10 @@
+age-encryption.org/v1
+-> ssh-ed25519 HwR33w xLbOv/c4pjyh513O2LPkoKcprKZbM+217yy1a8Z7AFo
+83NxTqotYXOM+w+gCR3zHdar9kNabgar0/eJBewO3DY
+-> ssh-ed25519 1nn+0Q Oc01U+rgGAizyKzhgvmqThlXAEMuhlRAqsQL+/ozQFs
+xHxOl3ESipcMZdnulTxC7W628patS2eO6681oNZa/6g
+-> e[x'-grease 6N W+gfF\l \ x}~
+yqY9BH/fmjHn2QizHe1/DRDfTJmSAVPuJlIOmeuXWfhhfiauy6ia/DjbgVjcyqha
+XarEaYsvkI4JqKODHRRaiJ1i3TOs2Cdk
+--- 5wtIT/mhGMy8kQHbzO1h9Wj7OgX1ax8bk6k05tfLhsQ
+�0�I԰��Ȭ�5�H�����,oq�eH�}������r2�,��Ъ\�4�U�#�]�Z"+j���
��y&W��O~(���өg	�~�A�?
\ No newline at end of file