pyrox.dev
nixos/restic: remove s3CredentialsFile option
This has been deprecated since 2021, so all users should have seen the
warning and migrated by now.
+1
-14
nixos/modules/services/backup/restic.nix
+1
-14
nixos/modules/services/backup/restic.nix
···
23
24
environmentFile = mkOption {
25
type = with types; nullOr str;
26
-
# added on 2021-08-28, s3CredentialsFile should
27
-
# be removed in the future (+ remember the warning)
28
-
default = config.s3CredentialsFile;
29
description = lib.mdDoc ''
30
file containing the credentials to access the repository, in the
31
format of an EnvironmentFile as described by systemd.exec(5)
32
-
'';
33
-
};
34
-
35
-
s3CredentialsFile = mkOption {
36
-
type = with types; nullOr str;
37
-
default = null;
38
-
description = lib.mdDoc ''
39
-
file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
40
-
for an S3-hosted repository, in the format of an EnvironmentFile
41
-
as described by systemd.exec(5)
42
'';
43
};
44
···
300
};
301
302
config = {
303
-
warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups);
304
assertions = mapAttrsToList (n: v: {
305
assertion = (v.repository == null) != (v.repositoryFile == null);
306
message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";
···
23
24
environmentFile = mkOption {
25
type = with types; nullOr str;
26
+
default = null;
27
description = lib.mdDoc ''
28
file containing the credentials to access the repository, in the
29
format of an EnvironmentFile as described by systemd.exec(5)
30
'';
31
};
32
···
288
};
289
290
config = {
291
assertions = mapAttrsToList (n: v: {
292
assertion = (v.repository == null) != (v.repositoryFile == null);
293
message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";