Skip to content

nixos/httpd: module cleanup #78802

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

Merged
merged 2 commits into from
Feb 1, 2020
Merged

nixos/httpd: module cleanup #78802

merged 2 commits into from
Feb 1, 2020

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Jan 30, 2020

Motivation for this change

First 9 commits are just module cleanup and should be squashed after review. By reading commit by commit it is easy to see I didn't really change anything, just cleanup.
Final commit should remain separate and provides an easy way for users to decide if they want to run httpd as a non root user by simply adding this to their configuration:

systemd.services.httpd = {
  serviceConfig.User = lib.mkForce "wwwrun";
  AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
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.

Sorry, something went wrong.

@aanderse aanderse requested review from infinisil and flokli January 30, 2020 02:26
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 30, 2020
Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A improvement suggestion, otherwise LGTM.

@aanderse aanderse marked this pull request as ready for review February 1, 2020 01:56
@aanderse
Copy link
Member Author

aanderse commented Feb 1, 2020

@GrahamcOfBorg test limesurvey mediawiki moodle nagios wordpress

@aanderse
Copy link
Member Author

aanderse commented Feb 1, 2020

Thanks @flokli 🎉

@aanderse aanderse merged commit be1c629 into NixOS:master Feb 1, 2020
@aanderse aanderse deleted the httpd-cleanup branch February 1, 2020 02:09
anna328p pushed a commit to anna328p/nixpkgs that referenced this pull request Feb 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants