From 2e0b0c270792db5b30bae72b9c7fa45176a1474a Mon Sep 17 00:00:00 2001 From: Amelia Cuss Date: Sat, 27 Apr 2024 16:35:27 +0300 Subject: [PATCH] nixos/akkoma: Don't warn if no installWrapper Currently the installWrapper warning is issued if sudo (and sudo-rs) aren't installed. This is fine, except we get the warning even if we explicitly turn off installWrapper -- say, for this very reason! Rather than warning on every build until either sudo is installed or Akkoma is uninstalled, only warn if cfg.installWrapper is true. --- nixos/modules/services/web-apps/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index b180db2d4ca0..7c9bf6c46516 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -957,7 +957,7 @@ in { assertions = optionals (cfg.config.":pleroma".":media_proxy".enabled && cfg.config.":pleroma".":media_proxy".base_url == null) ['' `services.akkoma.config.":pleroma".":media_proxy".base_url` must be set when the media proxy is enabled. '']; - warnings = optionals (with config.security; (!sudo.enable) && (!sudo-rs.enable)) ['' + warnings = optionals (with config.security; cfg.installWrapper && (!sudo.enable) && (!sudo-rs.enable)) ['' The pleroma_ctl wrapper enabled by the installWrapper option relies on sudo, which appears to have been disabled through security.sudo.enable. ''];