about summary refs log tree commit diff
diff options
context:
space:
mode:
authoremilylange <git@emilylange.de>2024-02-13 20:26:29 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-02-14 03:30:59 +0000
commit6ae5f8fe3f139925ae568cc98eac1a91c28b3c26 (patch)
tree4c63ebc4d58fa0720739edd401cbd10ee04ebf7f
parent35ff4e6b60b631bbf28ba1e5fe7ce0aff281b431 (diff)
nixos/garage: allow all available log levels in `cfg.logLevel`
`error` and `warn` have always been valid log levels.
But because the upstream docs never mentioned those, we simply didn't
add them to the enum of our module option.

The upstream docs have been updated and now mention `error` and `warn`
as well.

Upstream PR: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/716

(cherry picked from commit 993083f0ab6663ca914177082f423acf4e1d46f9)
-rw-r--r--nixos/modules/services/web-servers/garage.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix
index 47b4c6ab416e8..48dd5b34757c1 100644
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -30,7 +30,7 @@ in
     };
 
     logLevel = mkOption {
-      type = types.enum ([ "info" "debug" "trace" ]);
+      type = types.enum ([ "error" "warn" "info" "debug" "trace" ]);
       default = "info";
       example = "debug";
       description = lib.mdDoc "Garage log level, see <https://garagehq.deuxfleurs.fr/documentation/quick-start/#launching-the-garage-server> for examples.";