diff options
author | Florian Klink <flokli@flokli.de> | 2024-05-15 10:52:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-15 10:52:28 +0200 |
commit | 6ceb35e43426acb2f149bc8fa9da45a56679dd2a (patch) | |
tree | ddad87cbbff4f0317d31c6b26932cc200a529961 | |
parent | 81e1c9714d34f144dddba5cb8fe1b49d165c7ad0 (diff) | |
parent | 67cf6279d046f35a3a5be87af074ef063354d1b2 (diff) |
Merge pull request #311872 from NixOS/revert-309643-garage-replication_mode
Revert "nixos/garage: drop replication_mode setting"
-rw-r--r-- | nixos/modules/services/web-servers/garage.nix | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index f75829d64d67c..39ea8f21b126f 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -52,6 +52,13 @@ in type = types.path; description = "The main data storage, put this on your large storage (e.g. high capacity HDD)"; }; + + replication_mode = mkOption { + default = "none"; + type = types.enum ([ "none" "1" "2" "3" "2-dangerous" "3-dangerous" "3-degraded" 1 2 3 ]); + apply = v: toString v; + description = "Garage replication mode, defaults to none, see: <https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#replication-mode> for reference."; + }; }; }; description = "Garage configuration, see <https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/> for reference."; @@ -64,24 +71,6 @@ in }; config = mkIf cfg.enable { - - assertions = [ - # We removed our module-level default for replication_mode. If a user upgraded - # to garage 1.0.0 while relying on the module-level default, they would be left - # with a config which evaluates and builds, but then garage refuses to start - # because either replication_factor or replication_mode is required. - # This assertion can be removed in NixOS 24.11, when all users have been warned once. - { - assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package "1.0.0"; - message = '' - Garage 1.0.0 requires an explicit replication factor to be set. - Please set replication_factor to 1 explicitly to preserve the previous behavior. - https://git.deuxfleurs.fr/Deuxfleurs/garage/src/tag/v1.0.0/doc/book/reference-manual/configuration.md#replication_factor - - ''; - } - ]; - environment.etc."garage.toml" = { source = configFile; }; |