cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/restic: add 'backups.package' option to override the restic package (#183028)

Browse source
This commit is contained in:
Alan Strohm 2022-07-27 10:47:41 -07:00 committed by GitHub
parent 2f6dce6bd1
commit 81cd3e229c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/services/backup/restic.nix
View file

@ -222,6 +222,15 @@ in
A script that must run after finishing the backup process. A script that must run after finishing the backup process.
''; '';
}; };
package = mkOption {
type = types.package;
default = pkgs.restic;
defaultText = literalExpression "pkgs.restic";
description = ''
Restic package to use.
'';
};
}; };
})); }));
default = { }; default = { };
@ -254,7 +263,7 @@ in
(name: backup: (name: backup:
let let
extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions;
resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; resticCmd = "${backup.package}/bin/restic${extraOptions}";
filesFromTmpFile = "/run/restic-backups-${name}/includes"; filesFromTmpFile = "/run/restic-backups-${name}/includes";
backupPaths = backupPaths =
if (backup.dynamicFilesFrom == null) if (backup.dynamicFilesFrom == null)

9
nixos/tests/restic.nix
View file

@ -63,6 +63,12 @@ import ./make-test-python.nix (
inherit repository passwordFile; inherit repository passwordFile;
pruneOpts = [ "--keep-last 1" ]; pruneOpts = [ "--keep-last 1" ];
}; };
custompackage = {
inherit repository passwordFile paths;
package = pkgs.writeShellScriptBin "restic" ''
echo "$@" >> /tmp/fake-restic.log;
'';
};
}; };
environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local"; environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local";
@ -76,6 +82,7 @@ import ./make-test-python.nix (
"${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots", "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots",
'${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots"', '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots"',
"${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots",
"grep 'backup .* /opt' /tmp/fake-restic.log",
) )
server.succeed( server.succeed(
"mkdir -p /opt", "mkdir -p /opt",
@ -89,6 +96,8 @@ import ./make-test-python.nix (
'${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
'${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
'${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"',
"systemctl start restic-backups-custompackage.service",
"grep 'backup .* /opt' /tmp/fake-restic.log",
"timedatectl set-time '2017-12-13 13:45'", "timedatectl set-time '2017-12-13 13:45'",
"systemctl start restic-backups-remotebackup.service", "systemctl start restic-backups-remotebackup.service",
"rm /opt/backupCleanupCommand", "rm /opt/backupCleanupCommand",