From 8c1c1e864b78c5a5a8d30be72c4bdc2e03a0c186 Mon Sep 17 00:00:00 2001 From: Amanda Graven Date: Wed, 21 Jun 2023 17:35:12 +0200 Subject: [PATCH] Remaining backup jobs for wind --- config/hosts/wind/data/secrets/secrets.nix | Bin 1206 -> 1548 bytes config/hosts/wind/services/borg.nix | 20 ++++++++++++++++++++ config/sources/nix/sources.json | 12 ++++++------ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/config/hosts/wind/data/secrets/secrets.nix b/config/hosts/wind/data/secrets/secrets.nix index 7b552e07db4096a1ff3c56167436a11d6d78fd00..d95a37cdb202d2b8128269925995f2641737b549 100644 GIT binary patch literal 1548 zcmZQ@_Y83kiVO&0ct4}$lXr_?i^i#ywr8u8k8a#8^fO0nx4d@NCfWS+b_S1T2u9A@ zzo$~&r7|P$tgG(KN^bfPx$KdC2YH0WKyF6OOA#(HEz;{c_^6y@E^GnHbL>7J5B@@9qz=!Z)mp zFIkp6NI$Q9@`YJKf`wYq3Z-UstF&Tm$JueM^D_wno2r_1_m zYxZXbJb9t+Wn9YK{sT*PUPCWAM2)`@+J~_o*lKHpS&7r|k4&{2iZUcUe$C zW|Fh#QdtWlyMRL))@#=|-S};O=l9taO)FLRygqvH^*z^}MhmXC)c^Lhi+z2aE%Dj4 z$UmJKhvXQ(*z`80O<5uFcF*+5-Gy7vvR%99+Eb&+#mksKJ2rd0yKK&)Z+H$OOkv!8$O z*43<{5w=HXbJWr=M|Zg2cK)lkU4Lqba)@+9NX5-d+iRj6PPofPukq8+n8N#B@~Mzo zg3y{(-XHG#Q3z74zdJwT;+zE<%9Xnkl(LG-d!i$`Qv%D@p5g5~7HYUG{4^PV(kOFE4rSNuh@lip3i=l;cc@1M8o@kJt1t* z3gn7J;)UamuDz_DQ$z*WBXHs7Nz)+<&*}S3kc}hsVJ(PM)VN zQSMgaDSpK}9zKXLu+fhH@@3|C@#z~9A5ADdT9tK9b(S<& z_N1>3$9yLoX6JEF+_bWF*Rgc%qcZoV|9M)QYqBoFF6d6+?$|{N8{3}#N~j2756_%c zy7`mC;k!birwjiI)~tKGfAc3bwt(Vk+|^a#AG`d5xPw$!qjDZIyq#jc$@{;il#TG+ z$=h}NgxQJ?n}-$kC$?!W*{>1*kh50I`@w z@5oD4O~wp|z8L0p2w-B*_*RXkxFR#y}j&RIkzIag!kq= z=cy|;vMb#-n-lVQ@v+G3>QN?_*|bf1a(8T>KYRTqC&`7+d?F<>%92mtigV46iO~|i zx9F|h?B8bLH+P<0zcg;g%mo3{Z#1UIP0?Lg>1O3LWxMa^T@0(!oia);ort`;Z_e~< zO3xhLuJbh6IW=i%XRveyTNj_;B(^kBy#-}|XGneI6S+SBwc2arl)=2rF$%4B)#FjTP005|0^3VVP literal 1206 zcmZQ@_Y83kiVO&0SZOlh<0b{^u3sAu-rcYEJ&@Pfm(j{2{|n2l&-{5k(ZAiEgoKJd zYP#)q?ty%!j8WuWo2u6EtQV1=ll!#poM!L)TPO7LWz*3Jn_qRkap&5WGutNDzVyCu zeUHxtRU5VqlOngs)CXIY;=%OGLP zi5YSCbDJLJ)_&*tq$d^}`MTfrn^dMi?!9FTXYaJqbD8jG)?tC#tdw+@McXo)&6OYZ zPEpwGZ)Ee*zw`KBC7q5XZ?rgFIy4@BRQY|xIoUqGL@_>*=iwxWZPKp<4|`;&CTvwu zFDtyd_Hsnv~u7dA&GhrZH!^yXX3B$2}Bhf5BfR64J7@DJay19x(Nd**0) z&kI(230zXo2S!%yowFBa7bS%Hf_RW_bS$BfsX@O1iJ2q{ACJBoDr>d zy5y}4=)^XI&&o8W6=KmR~CnV8Mgz0zu{#g69nlM7bN zUoP?XqAxG~S8Yg5+0o`b<-cm;l8=X`I_>PUUi&s; zYdRm#H_y}ey_cL(X`B9q`+UluUd?F-&i_%JxXo>igu?A0t)Fqt7gmMWH)dSRaJs+G zs>4OqcTF3kh~ND9jLxau-HZ3uuf26<#SC7bAB-0_mWVcbo=yyzR=hzc{M%iT+Swe3 zzMPb}Hr?xm)2%Hw+h$a1x!-^M^6k;tO>^G7f1O;{WFE}??2hx2qe1_#On+H_#BdAC zMYa4rzjjqEXrDQcA?;_LUuQ#qf!=TN{f74fHcc)+omH_U{`BF4m6vALa7=3bTH;uK z&(<*NT_o@S`h|{m0Zr%Zx1=aa3;iy(CzPZHS;R%M zFGOy1 zHyamP-WI)ez4=elRqlkcl=#D!ePUkje`z_tg}rWFs?7Pr2iIL)th4l4m&c>J`=y|`IZUTl2-`P-5_!3i5}w*663u>H4C@x;|W%fsIVL!U4o=sCT0 zUh0Kq{`YdaScJAelGM3rF?CIAQ1Qa`TEd2PZpGcR{W}?! h&A9XN)9L7oUbP;=#q+oK^_r{Po;pEX!`(vv768rjY`y>h diff --git a/config/hosts/wind/services/borg.nix b/config/hosts/wind/services/borg.nix index 9c22666..7b8822e 100644 --- a/config/hosts/wind/services/borg.nix +++ b/config/hosts/wind/services/borg.nix @@ -12,5 +12,25 @@ startAt = "*-*-* 02:15:00"; user = "gitea"; }; + postgres = { + paths = "/var/lib/postgresql/backup"; + repo = "ssh://borg@despondos.nao.sh//mnt/slab/backup/wind/postgres"; + encryption.mode = "repokey"; + encryption.passCommand = "cat ${config.secrets.files.borg_pass_postgres.file}"; + environment.BORG_RSH = "ssh -i ${config.secrets.files.ssh_key_postgres.file}"; + compression = "auto,zstd"; + startAt = "*-*-* 03:15:00"; + user = "postgres"; + }; + synapse = { + paths = "/var/lib/matrix-synapse"; + repo = "ssh://borg@despondos.nao.sh//mnt/slab/backup/wind/synapse"; + encryption.mode = "repokey"; + encryption.passCommand = "cat ${config.secrets.files.borg_pass_synapse.file}"; + environment.BORG_RSH = "ssh -i ${config.secrets.files.ssh_key_synapse.file}"; + compression = "auto,zstd"; + startAt = "*-*-* 03:15:00"; + user = "matrix-synapse"; + }; }; } diff --git a/config/sources/nix/sources.json b/config/sources/nix/sources.json index fe11bbb..73f29b7 100644 --- a/config/sources/nix/sources.json +++ b/config/sources/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "0ebb80e003c26d5388a9b74645fbdcfca3bdd0ef", - "sha256": "0wpnk1n4vjyqwjjrm6dvkyh7xr7983rszfhfcg31v106qhfnh41c", + "rev": "914aba08a26cb10538b84d00d6cfb01c9776d80c", + "sha256": "0gx316gc7prjay5b0cr13x4zc2pdbiwxkfkpjvrlb2rml80lm4pm", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/0ebb80e003c26d5388a9b74645fbdcfca3bdd0ef.tar.gz", + "url": "https://github.com/nmattia/niv/archive/914aba08a26cb10538b84d00d6cfb01c9776d80c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-hardware": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "083cb1a04d196e35b9c8293a379266c854e284c1", - "sha256": "0fl9cq9h8i0dc50b1h0snmmcb3vsxz4d14jzsjw4ixfd2bm4dl0n", + "rev": "c38961c681b546eb4bedc6ea6e5fb19b012a1612", + "sha256": "1xvf4q67k3wvq1y9wbm0mnmxpixm6ljniqagn5rbwmh0vd5gggrx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/083cb1a04d196e35b9c8293a379266c854e284c1.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/c38961c681b546eb4bedc6ea6e5fb19b012a1612.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixus": {