Unverified Commit a751e2fa authored by Pascal Wittmann's avatar Pascal Wittmann Committed by GitHub
Browse files

Merge pull request #302908 from kai-tub/nixos/restic/fix-checkCmd 

nixos/restic: fix skipping of check command
parents 6918edeb c650982a

nixos/modules/services/backup/restic.nix

+14 −5
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ in 
    description = ''

      Periodic backups to create with Restic.

    '';

    type = types.attrsOf (types.submodule ({ config, name, ... }: {

    type = types.attrsOf (types.submodule ({ name, ... }: {

      options = {

        passwordFile = mkOption {

          type = types.str;
@@ -206,12 +206,19 @@ in 
          ];

        };



        runCheck = mkOption {

          type = types.bool;

          default = (builtins.length config.services.restic.backups.${name}.checkOpts > 0);

          defaultText = literalExpression ''builtins.length config.services.backups.${name}.checkOpts > 0'';

          description = "Whether to run the `check` command with the provided `checkOpts` options.";

          example = true;

        };



        checkOpts = mkOption {

          type = types.listOf types.str;

          default = [ ];

          description = ''

            A list of options for 'restic check', which is run after

            pruning.

            A list of options for 'restic check'.

          '';

          example = [

            "--with-cache"
@@ -298,6 +305,8 @@ in 
            doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != []);

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

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

            ];

            checkCmd = optionals backup.runCheck [

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

            ];

            # Helper functions for rclone remotes
@@ -331,7 +340,7 @@ in 
            serviceConfig = {

              Type = "oneshot";

              ExecStart = (optionals doBackup [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} --files-from=${filesFromTmpFile}" ])

                ++ pruneCmd;

                ++ pruneCmd ++ checkCmd;

              User = backup.user;

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

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