+1 -1

lib/apps/restoreBackup.nix

reviewed

··· 23 23 toString (pkgs.writers.writeBash "restoreBackup" '' 24 24 set -euo pipefail 25 25 26 26 - REMOTE="r2-encrypted" 26 26 + REMOTE="r2crypt" 27 27 CONFIG="${defaultConf}" 28 28 ENV_FILE="${defaultEnv}" 29 29 SERVICE=""

+5 -5

modules/server/backup.nix

reviewed

··· 48 48 ${coreutils}/bin/cp -a "${path.path}/${item}" "$TMP/${path.name}/" 49 49 fi 50 50 '') path.extras} 51 51 - ${rclone} ${rcloneFlags} copy "$TMP/${path.name}" "r2-encrypted:${path.name}/$DATE/" 51 51 + ${rclone} ${rcloneFlags} copy "$TMP/${path.name}" "r2crypt:${path.name}/$DATE/" 52 52 ''; 53 53 54 54 mkSqlitePrune = path: '' 55 55 CUTOFF=$(${coreutils}/bin/date -d '-${toString backup.retention} days' +%Y-%m-%d) 56 56 - ${rclone} ${rcloneFlags} lsd "r2-encrypted:${path.name}/" 2>/dev/null | ${coreutils}/bin/awk '{print $NF}' | while read -r dir; do 56 56 + ${rclone} ${rcloneFlags} lsd "r2crypt:${path.name}/" 2>/dev/null | ${coreutils}/bin/awk '{print $NF}' | while read -r dir; do 57 57 if [[ "$dir" < "$CUTOFF" ]]; then 58 58 - ${rclone} ${rcloneFlags} purge "r2-encrypted:${path.name}/$dir/" || true 58 58 + ${rclone} ${rcloneFlags} purge "r2crypt:${path.name}/$dir/" || true 59 59 fi 60 60 done 61 61 ''; 62 62 63 63 mkSyncBackup = path: '' 64 64 echo "Syncing ${path.name}..." 65 65 - ${rclone} ${rcloneFlags} sync "${path.path}" "r2-encrypted:${path.name}/" 65 65 + ${rclone} ${rcloneFlags} sync "${path.path}" "r2crypt:${path.name}/" 66 66 ''; 67 67 68 68 in helpers.linuxAttrs { ··· 120 120 endpoint = https://${backup.r2AccountId}.r2.cloudflarestorage.com 121 121 acl = private 122 122 123 123 - [r2-encrypted] 123 123 + [r2crypt] 124 124 type = crypt 125 125 remote = r2:${backup.bucket} 126 126 '';

modules/server/encrypt/rclone-backup.env.age

reviewed

This is a binary file and will not be displayed.