hosting/selfhostblocks
1
0
Fork 0
Code Issues Activity

remove group and retention from backup contract

Browse source 
Group is not strictly needed.
Retention is an implementation detail of the service backing up, not part of the contract.
This commit is contained in:
ibizaman 2024-08-23 22:45:02 +02:00
parent 36a2041bb2
commit 2e8b3fb166
2 changed files with 1 additions and 36 deletions
modules
blocks
restic.nix
contracts
backup.nix

18
modules/blocks/restic.nix
View file

@ -23,16 +23,6 @@ let
default = cfg.user;
};
group = lib.mkOption {
description = ''
Unix group doing the backups.
For Restic, the same group must be used for all instances.
'';
type = lib.types.str;
default = cfg.group;
};
sourceDirectories = lib.mkOption {
description = "Source directories.";
type = lib.types.nonEmptyListOf lib.types.str;
@ -131,12 +121,6 @@ in
default = "backup";
};
group = lib.mkOption {
description = "Unix group doing the backups.";
type = lib.types.str;
default = "backup";
};
instances = lib.mkOption {
description = "Each instance is a backup setting";
default = {};
@ -209,7 +193,7 @@ in
systemd.tmpfiles.rules =
let
mkRepositorySettings = name: instance: repository: lib.optionals (lib.hasPrefix "/" repository.path) [
"d '${repository.path}' 0750 ${instance.user} ${instance.group} - -"
"d '${repository.path}' 0750 ${instance.user} root - -"
];
mkSettings = name: instance: builtins.map (mkRepositorySettings name instance) instance.repositories;

19
modules/contracts/backup.nix
View file

@ -6,13 +6,6 @@ lib.types.submodule {
user = lib.mkOption {
description = "Unix user doing the backups.";
type = lib.types.str;
default = "backup";
};
group = lib.mkOption {
description = "Unix group doing the backups.";
type = lib.types.str;
default = "backup";
};
sourceDirectories = lib.mkOption {
@ -26,18 +19,6 @@ lib.types.submodule {
default = [];
};
retention = lib.mkOption {
description = "Backup files retention.";
type = lib.types.attrsOf (lib.types.oneOf [ lib.types.int lib.types.nonEmptyStr ]);
default = {
keep_within = "1d";
keep_hourly = 24;
keep_daily = 7;
keep_weekly = 4;
keep_monthly = 6;
};
};
hooks = lib.mkOption {
description = "Hooks to run around the backup.";
default = {};