jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Fixes for borg

Browse source
This commit is contained in:
Joseph Hanson 2024-07-26 23:51:45 -05:00
parent a92b6977ca
commit 47dfdfcac0
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
nixos/hosts/gandalf/default.nix
View file

@ -62,9 +62,6 @@ in
mode = "0444"; mode = "0444";
sopsFile = ./secrets.sops.yaml; sopsFile = ./secrets.sops.yaml;
}; };
"borg/repository/location" = {
sopsFile = ./secrets.sops.yaml;
};
"borg/repository/passphrase" = { "borg/repository/passphrase" = {
sopsFile = ./secrets.sops.yaml; sopsFile = ./secrets.sops.yaml;
}; };
@ -88,13 +85,13 @@ in
resticBackup.local.enable = false; resticBackup.local.enable = false;
resticBackup.remote.enable = false; resticBackup.remote.enable = false;
# # Borg # # Borg
# borgbackup = { borgbackup = {
# enable = true; enable = true;
# paths = [ "/home" ]; paths = [ "/home" ];
# exclude = [ ]; exclude = [ ];
# repo = "ssh://t3zvn0dd@t3zvn0dd.repo.borgbase.com/./repo"; repo = "ssh://t3zvn0dd@t3zvn0dd.repo.borgbase.com/./repo";
# repoKeyPath = "/run/secrets/borgbackup/telchar"; repoKeyPath = config.sops.secrets."borg/repository/passphrase".path;
# }; };
}; };
services = { services = {
podman.enable = true; podman.enable = true;

5
nixos/hosts/gandalf/secrets.sops.yaml
View file

@ -3,7 +3,6 @@ lego:
token: ENC[AES256_GCM,data:CfRFhGE8AyZfO9RzoXXTfm8kstvx+Fuy53o9ulYNZiufzzSQ4KzwYIoCRw==,iv:HEC8hRpmk7YDI7RHj29ZAeFKyPgsWTHw1sxjdZuhcrw=,tag:7RhEhZ9GkyBE9PJRe+gD+Q==,type:str] token: ENC[AES256_GCM,data:CfRFhGE8AyZfO9RzoXXTfm8kstvx+Fuy53o9ulYNZiufzzSQ4KzwYIoCRw==,iv:HEC8hRpmk7YDI7RHj29ZAeFKyPgsWTHw1sxjdZuhcrw=,tag:7RhEhZ9GkyBE9PJRe+gD+Q==,type:str]
borg: borg:
repository: repository:
location: ENC[AES256_GCM,data:C3W4H2Tp23jEAbkrXv2lvWLSsragsphl+i51sWGfrQ2wXjAwj59LPtLpPHxggvCc,iv:l5FA/wgoCnyzCnCChi6iE2Acq5aMkmWdFec2kYj9lA0=,tag:IB/4ThqFqbMIQKPAof7fbQ==,type:str]
passphrase: ENC[AES256_GCM,data:lt0Rq269GoBuLNw9fxwuMAmtYjE=,iv:57IFde6EX7myLSCvYXkkbSulr8S7JPYoThWBsPLH0Yw=,tag:NwlpouurYF+2qmw2T3De8A==,type:str] passphrase: ENC[AES256_GCM,data:lt0Rq269GoBuLNw9fxwuMAmtYjE=,iv:57IFde6EX7myLSCvYXkkbSulr8S7JPYoThWBsPLH0Yw=,tag:NwlpouurYF+2qmw2T3De8A==,type:str]
sops: sops:
kms: [] kms: []
@ -74,8 +73,8 @@ sops:
V1d0d1lKb3hyYVQ4elBIZ0hnU3FTbnMKiWERjAwlJRPK+PILCBV03uyNVnNgolA8 V1d0d1lKb3hyYVQ4elBIZ0hnU3FTbnMKiWERjAwlJRPK+PILCBV03uyNVnNgolA8
PS0vbIDVNiX0pIrRlM2sVivZwqajjTB3XROXMmbIKpQxDMjvpHgqJA== PS0vbIDVNiX0pIrRlM2sVivZwqajjTB3XROXMmbIKpQxDMjvpHgqJA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-07-27T03:58:24Z" lastmodified: "2024-07-27T04:50:25Z"
mac: ENC[AES256_GCM,data:1X1tYx+zciKiwSrxfdV5BF+MLzNZaw3umgNay5c1xO5zUilAIvf7iAoQPZoDh26AxSTG5qTL5A1IC0YGYYpIasF20bBThpLDzfaA2wMpZSL7OPggIH2t/GInwPOOvBph4O1POtpOtpyRGa2ZYB7e/Ix9dbHlagOsOSdAmi3xkRU=,iv:O5nrQDCCMiblm9PQzwV4xPzyY4GaIEJuA4LOgUJfmYA=,tag:WmdUbf+M9qDNGLJQEdvhdQ==,type:str] mac: ENC[AES256_GCM,data:IKLC9N4FvfV+eWFoVZa5ijyBdiQuNdXAE4Z/pQNhns+qTuMpuz9QLeQGysow8zCqg9z5WHPa+U10uBIJg0P6Bq2CkBTJ2/75axsQgqc+BPuY4cUfppbYqQaSzB831b3XMHei9m/IPXNoh277jk0E9A0mOzHu4YsBEEzyf5nESn4=,iv:dOIgrQD0eDB1lqTWoDoLXnDZTWJLf5m9a948Wabfc6I=,tag:MWoIe5UpTqZCDDJMcg0swA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

4
nixos/modules/nixos/system/borg/default.nix
View file

@ -8,24 +8,20 @@ in
paths = lib.mkOption { paths = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = [ ]; default = [ ];
required = true;
}; };
exclude = lib.mkOption { exclude = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = [ ]; default = [ ];
required = false;
}; };
repo = lib.mkOption { repo = lib.mkOption {
example = "borgbackup@myserver:repo"; example = "borgbackup@myserver:repo";
type = lib.types.str; type = lib.types.str;
default = ""; default = "";
required = true;
}; };
repoKeyPath = lib.mkOption { repoKeyPath = lib.mkOption {
example = "/run/secrets/borgbackup/telchar"; example = "/run/secrets/borgbackup/telchar";
type = lib.types.str; type = lib.types.str;
default = ""; default = "";
required = false;
}; };
}; };