Skip to content

Commit

Permalink
nixos/akkoma: Don't warn if no installWrapper
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kivikakk authored and tomfitzhenry committed Apr 27, 2024
1 parent 7de07e1 commit 2e0b0c2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/akkoma.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
''];
Expand Down

0 comments on commit 2e0b0c2

Please sign in to comment.