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

Support journal gatewayd #102213

Closed
wants to merge 2 commits into from
Closed

Conversation

nlewo
Copy link
Member

@nlewo nlewo commented Oct 31, 2020

Motivation for this change

Since ae896e0, Systemd is no longer compiled with the http gateway because of an incompatibility between Systemd and libmicrohttpd. However, because of some updates, it is now building fine!

I also enable this feature is the systemd test to ensure the option services.journald.enableHttpGateway is working as excepted.

Note i also want to backport this patch to 20.09.

cc @flokli

Things done
  • 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 reverts commit ae896e0.

Systemd compilation now succeeds with our libmicrohttpd version.
@nlewo
Copy link
Member Author

nlewo commented Oct 31, 2020

@GrahamcOfBorg test systemd

@ajs124
Copy link
Member

ajs124 commented Oct 31, 2020

This should probably be optional, since we're going that way with #101886. Assuming that gets merged, but I don't see why it wouldn't.

@nlewo
Copy link
Member Author

nlewo commented Oct 31, 2020

@ajs124 Thanks for the link.
I started to discuss about this feature in the PR #101885 .
I would however prefer to let this PR open because it's not improvement but a bug fix (the NixOS option services.journald.enableHttpGateway is currently broken).

@nlewo nlewo changed the base branch from master to staging October 31, 2020 16:17
@nlewo nlewo changed the base branch from staging to master October 31, 2020 16:25
@nlewo
Copy link
Member Author

nlewo commented Oct 31, 2020

Hm, it's actually hard to apply the revert on staging because of merge conflicts. So, I don't think it's relevant to keep this PR open.
I will submit one to fix the option on 20.09 and continue the discussion in #101886.

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