diff --git a/lib/apps/restoreBackup.nix b/lib/apps/restoreBackup.nix index 150ad63..826a6ef 100644 --- a/lib/apps/restoreBackup.nix +++ b/lib/apps/restoreBackup.nix @@ -23,7 +23,7 @@ in toString (pkgs.writers.writeBash "restoreBackup" '' set -euo pipefail - REMOTE="r2-encrypted" + REMOTE="r2crypt" CONFIG="${defaultConf}" ENV_FILE="${defaultEnv}" SERVICE="" diff --git a/modules/server/backup.nix b/modules/server/backup.nix index c7bdadb..8bff283 100644 --- a/modules/server/backup.nix +++ b/modules/server/backup.nix @@ -48,21 +48,21 @@ let ${coreutils}/bin/cp -a "${path.path}/${item}" "$TMP/${path.name}/" fi '') path.extras} - ${rclone} ${rcloneFlags} copy "$TMP/${path.name}" "r2-encrypted:${path.name}/$DATE/" + ${rclone} ${rcloneFlags} copy "$TMP/${path.name}" "r2crypt:${path.name}/$DATE/" ''; mkSqlitePrune = path: '' CUTOFF=$(${coreutils}/bin/date -d '-${toString backup.retention} days' +%Y-%m-%d) - ${rclone} ${rcloneFlags} lsd "r2-encrypted:${path.name}/" 2>/dev/null | ${coreutils}/bin/awk '{print $NF}' | while read -r dir; do + ${rclone} ${rcloneFlags} lsd "r2crypt:${path.name}/" 2>/dev/null | ${coreutils}/bin/awk '{print $NF}' | while read -r dir; do if [[ "$dir" < "$CUTOFF" ]]; then - ${rclone} ${rcloneFlags} purge "r2-encrypted:${path.name}/$dir/" || true + ${rclone} ${rcloneFlags} purge "r2crypt:${path.name}/$dir/" || true fi done ''; mkSyncBackup = path: '' echo "Syncing ${path.name}..." - ${rclone} ${rcloneFlags} sync "${path.path}" "r2-encrypted:${path.name}/" + ${rclone} ${rcloneFlags} sync "${path.path}" "r2crypt:${path.name}/" ''; in helpers.linuxAttrs { @@ -120,7 +120,7 @@ in helpers.linuxAttrs { endpoint = https://${backup.r2AccountId}.r2.cloudflarestorage.com acl = private - [r2-encrypted] + [r2crypt] type = crypt remote = r2:${backup.bucket} ''; diff --git a/modules/server/encrypt/rclone-backup.env.age b/modules/server/encrypt/rclone-backup.env.age index a6ea4844512fdaba8a01ae4cbe9b13263310ff7e..b1aafec8165cef8f7d6f5b9ef73a3aa10ae3c210 100644 GIT binary patch delta 506 zcmZ3&GKXb?PJK~Wnr~@hiiLAgT119{zGsSaiIZWfV~M+mfk{qkzHfG*9AYAKl=TWzv-sYh>a`h+}b#b3*<4~28+}pphywTX}{NAhc4*oZ6 MuUy+HS0i)>0O;D?k^lez delta 514 zcmbQkvV>)VPJN(TfLms0rnhNXW|(JsigQtUmXlX`std6{QWMtXsTFPE;au7YQp zSH8ZhxpSqXe~yuJsaLs0PL@kRnq^f+WRPD>gomVJf9`@ zSg3oxK4s**W1ptL^$M*ATO?-vy?6KFDl?O8{laaT%Wi}{$Z@`KW105j%YNM^w>(zn z{?3k0`fbpubu3X${JmSq%*EEfoF!}WDy45Wx^0{I>9NLbqsZ2b~TvU?K$eRiKy|Mk?>WhdAqqnb2@K8I}1DB*V8y@R{y7-Rf8{bl=N*B;X}Xr9k} z_IYO3EAzk;Nn!_g=qGP)X`g%NN3zRKiD~a#Et~51rkiX3 z+U*%j-s*O^>{DsKYU&xQv)AkL@`&1}tF0@pDIc72{YzfbdfkYdrL706uZeX`s}Z?= zHqPktrQX>&>olsru#4}j2%auBX-ZqYlZb7h(28v}8-(6i1x@?VvqQ;P>D81j6^qKJ z=M=a1AMhw+IeRVpJV*A;-;5Cvg-XedEejqbW*?orTwddDSR_N$(mnNg83Ob77(LGK Vk#v3esM$p^dl^^L5!cd#%K(O=>E8eV