Commit adafbeff authored by Alvar Penning's avatar Alvar Penning
Browse files

nixos/restic: generalize cache configuration 

The restic repository cache location defaults to ~/.cache/restic when
not overwritten either by the --cache-dir command line parameter or the
universal RESTIC_CACHE_DIR environment variable.

Currently, the --cache-dir variable is set to only some restic commands,
but, e.g., not to the unit's preStart command for the module's
initialize option. This results in two distinct cache locations, one at
~/.cache/restic for the initialize commands and one at the configured
--cache-dir location for the restic backup command.

By explicitly setting RESTIC_CACHE_DIR for the unit, only one cache at
the correct location will be used.

https://restic.readthedocs.io/en/v0.15.1/manual_rest.html#caching
parent 898da5f7

nixos/modules/services/backup/restic.nix

+4 −3
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ in 
              then if (backup.paths != null) then concatStringsSep " " backup.paths else ""

              else "--files-from ${filesFromTmpFile}";

            pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [

              (resticCmd + " forget --prune --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.pruneOpts))

              (resticCmd + " check --cache-dir=%C/restic-backups-${name} " + (concatStringsSep " " backup.checkOpts))

              (resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts))

              (resticCmd + " check " + (concatStringsSep " " backup.checkOpts))

            ];

            # Helper functions for rclone remotes

            rcloneRemoteName = builtins.elemAt (splitString ":" backup.repository) 1;
@@ -314,6 +314,7 @@ in 
          in

          nameValuePair "restic-backups-${name}" ({

            environment = {

              RESTIC_CACHE_DIR = "%C/restic-backups-${name}";

              RESTIC_PASSWORD_FILE = backup.passwordFile;

              RESTIC_REPOSITORY = backup.repository;

              RESTIC_REPOSITORY_FILE = backup.repositoryFile;
@@ -332,7 +333,7 @@ in 
            restartIfChanged = false;

            serviceConfig = {

              Type = "oneshot";

              ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ])

              ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ])

                ++ pruneCmd;

              User = backup.user;

              RuntimeDirectory = "restic-backups-${name}";

nixos/tests/restic.nix

+3 −3

File changed.

Contains only whitespace changes.