Merge branch 'main' of git.ocjtech.us:jeff/nixos-restic
This commit is contained in:
Jeffrey C. Ollie
commit
9367bd0267
4 changed files with 398 additions and 274 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
/result*
|
||||
24
0001-Skip-testing-restore-with-permission-failure.patch
Normal file
24
0001-Skip-testing-restore-with-permission-failure.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
From 8e6186be04e2819b6e3586e5d1aeb8a824e1979f Mon Sep 17 00:00:00 2001
|
||||
From: Simon Bruder <simon@sbruder.de>
|
||||
Date: Thu, 25 Feb 2021 09:20:51 +0100
|
||||
Subject: [PATCH] Skip testing restore with permission failure
|
||||
|
||||
The test fails in sandboxed builds.
|
||||
---
|
||||
cmd/restic/integration_test.go | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cmd/restic/integration_test.go b/cmd/restic/integration_test.go
|
||||
index 7d198d33..1588ccb1 100644
|
||||
--- a/cmd/restic/integration_test.go
|
||||
+++ b/cmd/restic/integration_test.go
|
||||
@@ -1170,6 +1170,7 @@ func TestRestoreLatest(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestRestoreWithPermissionFailure(t *testing.T) {
|
||||
+ t.Skip("Skipping testing restore with permission failure")
|
||||
env, cleanup := withTestEnvironment(t)
|
||||
defer cleanup()
|
||||
|
||||
--
|
||||
2.29.2
|
||||
42
flake.lock
Normal file
42
flake.lock
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1678470307,
|
||||
"narHash": "sha256-OEeMUr3ueLIXyW/OaFUX5jUdimyQwMg/7e+/Q0gC/QE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0c4800d579af4ed98ecc47d464a5e7b0870c4b1f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
83
flake.nix
83
flake.nix
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
description = "openlens";
|
||||
description = "Restic";
|
||||
|
||||
inputs = {
|
||||
nixpkgs = {
|
||||
|
|
@ -16,17 +16,70 @@
|
|||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
};
|
||||
arch = {
|
||||
"x86_64-linux" = "amd64";
|
||||
}.${system};
|
||||
in
|
||||
{
|
||||
packages = { };
|
||||
packages = {
|
||||
restic =
|
||||
let
|
||||
pname = "restic";
|
||||
version = "0.15.1";
|
||||
sha256 = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o=";
|
||||
vendorSha256 = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms=";
|
||||
in
|
||||
pkgs.buildGoModule {
|
||||
inherit pname version;
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "restic";
|
||||
repo = "restic";
|
||||
rev = "v${version}";
|
||||
sha256 = sha256;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# The TestRestoreWithPermissionFailure test fails in Nix’s build sandbox
|
||||
./0001-Skip-testing-restore-with-permission-failure.patch
|
||||
];
|
||||
|
||||
vendorSha256 = vendorSha256;
|
||||
|
||||
subPackages = [ "cmd/restic" ];
|
||||
|
||||
nativeBuildInputs = [ pkgs.installShellFiles pkgs.makeWrapper ];
|
||||
|
||||
passthru.tests.restic = pkgs.nixosTests.restic;
|
||||
|
||||
postPatch = ''
|
||||
rm cmd/restic/integration_fuse_test.go
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/restic --prefix PATH : '${pkgs.rclone}/bin'
|
||||
'' + pkgs.lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
|
||||
$out/bin/restic generate \
|
||||
--bash-completion restic.bash \
|
||||
--zsh-completion restic.zsh \
|
||||
--man .
|
||||
installShellCompletion restic.{bash,zsh}
|
||||
installManPage *.1
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
homepage = "https://restic.net";
|
||||
description = "A backup program that is fast, efficient and secure";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.bsd2;
|
||||
maintainers = [ maintainers.mbrgm ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
) // {
|
||||
nixosModules.restic = { config, lib, pkgs, ... }:
|
||||
nixosModules = {
|
||||
restic = { config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.restic;
|
||||
package = self.packages.${pkgs.system}.restic;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
|
@ -136,7 +189,7 @@
|
|||
in
|
||||
lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [
|
||||
pkgs.restic
|
||||
package
|
||||
];
|
||||
|
||||
environment.etc."restic/password" = {
|
||||
|
|
@ -156,6 +209,7 @@
|
|||
''
|
||||
else
|
||||
"";
|
||||
|
||||
storageConfig = {
|
||||
"b2" = ''
|
||||
B2_ACCOUNT_ID=${cfg.b2.account_id}
|
||||
|
|
@ -166,10 +220,12 @@
|
|||
AZURE_ACCOUNT_KEY=${cfg.azure.account_key}
|
||||
'';
|
||||
}.${cfg.storage};
|
||||
|
||||
repositoryConfig = {
|
||||
"b2" = "b2:${bucket}:${directory}";
|
||||
"azure" = "azure:${bucket}:${directory}";
|
||||
}.${cfg.storage};
|
||||
|
||||
in
|
||||
{
|
||||
text = ''
|
||||
|
|
@ -269,7 +325,7 @@
|
|||
''
|
||||
${backup.preCommand}
|
||||
|
||||
${pkgs.restic}/bin/restic backup${one-file-system}${excludes} ${paths}
|
||||
${package}/bin/restic backup${one-file-system}${excludes} ${paths}
|
||||
|
||||
${backup.postCommand}
|
||||
''
|
||||
|
|
@ -282,7 +338,7 @@
|
|||
|
||||
if [ "$config" != "true" ]
|
||||
then
|
||||
${pkgs.restic}/bin/restic init
|
||||
${package}/bin/restic init
|
||||
fi
|
||||
'';
|
||||
|
||||
|
|
@ -295,7 +351,7 @@
|
|||
config=$(${pkgs.rclone}/bin/rclone --config /etc/restic/rclone lsjson "azure:${bucket}/config" | ${pkgs.jq}/bin/jq -r '. | length | . > 0')
|
||||
if [ "$config" != "true" ]
|
||||
then
|
||||
${pkgs.restic}/bin/restic init
|
||||
${package}/bin/restic init
|
||||
fi
|
||||
'';
|
||||
}.${cfg.storage};
|
||||
|
|
@ -314,9 +370,9 @@
|
|||
|
||||
${backupCommands}
|
||||
|
||||
${pkgs.restic}/bin/restic forget --prune --keep-daily 14
|
||||
${pkgs.restic}/bin/restic check
|
||||
${pkgs.restic}/bin/restic cache --cleanup
|
||||
${package}/bin/restic forget --prune --keep-daily 14
|
||||
${package}/bin/restic check
|
||||
${package}/bin/restic cache --cleanup
|
||||
|
||||
${hcStop}
|
||||
'';
|
||||
|
|
@ -332,4 +388,5 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue