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

nixos/httpd: module cleanup #78802

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
Contributor

@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.
Copy link
Contributor

@flokli flokli left a comment

A improvement suggestion, otherwise LGTM.

@aanderse aanderse force-pushed the aanderse:httpd-cleanup branch from 4c262e9 to 0224720 Feb 1, 2020
@aanderse aanderse marked this pull request as ready for review Feb 1, 2020
@aanderse
Copy link
Contributor Author

@aanderse aanderse commented Feb 1, 2020

@GrahamcOfBorg test limesurvey mediawiki moodle nagios wordpress

@aanderse
Copy link
Contributor Author

@aanderse aanderse commented Feb 1, 2020

Thanks @flokli 🎉

@aanderse aanderse merged commit be1c629 into NixOS:master Feb 1, 2020
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.limesurvey, tests.mediawiki, tests.moodle, tests.nagios, tests.wordpress on aarch64-linux Success
Details
tests.limesurvey, tests.mediawiki, tests.moodle, tests.nagios, tests.wordpress on x86_64-linux Success
Details
@aanderse aanderse deleted the aanderse:httpd-cleanup branch Feb 1, 2020
anna328p added 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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.