Skip to content

Support journal gatewayd#102213

Closed
nlewo wants to merge 2 commits intoNixOS:masterfrom
nlewo:support-journal-gatewayd
Closed

Support journal gatewayd#102213
nlewo wants to merge 2 commits intoNixOS:masterfrom
nlewo:support-journal-gatewayd

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.

nlewo added 2 commits October 31, 2020 09:14
@nlewo
Revert "systemd: disable remote support"
15acc34 
This reverts commit ae896e0.

Systemd compilation now succeeds with our libmicrohttpd version.
@nlewo
nixos.tests.systemd: enable http gateway to ensure it is supported
71dd0e2
@nlewo
Copy link
Member Author

nlewo commented Oct 31, 2020

@GrahamcOfBorg test systemd

@ofborg ofborg bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Oct 31, 2020
@ofborg ofborg bot requested review from andir, edolstra and flokli October 31, 2020 08:45
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Oct 31, 2020
@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.

@nlewo nlewo closed this Oct 31, 2020
@ofborg ofborg bot added 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: python Python is a high-level, general-purpose programming language. labels Oct 31, 2020
@ofborg ofborg bot added 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

@flokli flokli Awaiting requested review from flokli

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@infinisil infinisil Awaiting requested review from infinisil

@jonringer jonringer Awaiting requested review from jonringer

@Lassulus Lassulus Awaiting requested review from Lassulus

@mmahut mmahut Awaiting requested review from mmahut

@nbp nbp Awaiting requested review from nbp

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

@stigtsp stigtsp Awaiting requested review from stigtsp

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@nlewo @ajs124