Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Systemd with the remote feature enabled by default #102448

Merged
merged 2 commits into from Nov 2, 2020

Conversation

nlewo
Copy link
Member

@nlewo nlewo commented Nov 2, 2020

Motivation for this change

Since ae896e0, Systemd is no longer compiled with the journal gatewayd service because of an incompatibility between Systemd and libmicrohttpd. However, thanks to some updates, it is now building fine!

Note also the NixOS option services.systemd.enableHttpGateway is currently broken and this PR fixes it.

Things done

Set withRemote to true by default in systemd and disable this feature in systemdMinimal.

The test systemd-journal has been added to ensure the systemd-journal-gatewayd is running correctly.

This test is passing when #102156 is reverted (thanks @flokli for the build;)).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
This test allows to ensure the systemd-journal-gatewayd service is
responding correcly when the NixOS option `enableHttpGateway` is set.

The test has not been added into the main systemd test because a
graphical stack is not required (and rebuilding the graphical stack on
systemd change is huge).
@flokli
Copy link
Contributor

flokli commented Nov 2, 2020

Locally rebased this on top of #102469, and successfully ran nixosTests.systemd-journal.

@flokli flokli merged commit 2308df8 into NixOS:staging Nov 2, 2020
@flokli flokli mentioned this pull request Nov 2, 2020
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants