diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-27 11:36:31 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-27 12:31:54 +0000 |
commit | 44ff5dfca2cc87bbfdc89bcb34e30f14385cbe1c (patch) | |
tree | d85a466715e8a4744c2878655049feb8b1332705 /nixos | |
parent | 3f6fbb1e0c3393acc6c8faa0c3d0e7fa38f84a43 (diff) |
nixos/restic: remove s3CredentialsFile option
This has been deprecated since 2021, so all users should have seen the warning and migrated by now.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/backup/restic.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 141eb4d07c4fc..49a55d0560140 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -23,25 +23,13 @@ in environmentFile = mkOption { type = with types; nullOr str; - # added on 2021-08-28, s3CredentialsFile should - # be removed in the future (+ remember the warning) - default = config.s3CredentialsFile; + default = null; description = lib.mdDoc '' file containing the credentials to access the repository, in the format of an EnvironmentFile as described by systemd.exec(5) ''; }; - s3CredentialsFile = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY - for an S3-hosted repository, in the format of an EnvironmentFile - as described by systemd.exec(5) - ''; - }; - rcloneOptions = mkOption { type = with types; nullOr (attrsOf (oneOf [ str bool ])); default = null; @@ -300,7 +288,6 @@ in }; config = { - 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); assertions = mapAttrsToList (n: v: { assertion = (v.repository == null) != (v.repositoryFile == null); message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; |