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

Jump to bottom

nixos/httpd: module cleanup #72789

Merged
merged 2 commits into from Nov 6, 2019
Merged

nixos/httpd: module cleanup #72789

merged 2 commits into from Nov 6, 2019

Conversation

aanderse
Copy link
Member

@aanderse aanderse commented Nov 4, 2019

Motivation for this change
  • nixos/httpd: drop stateDir option, hardcode to /run/httpd
    • module cleanup in preparation for allowing httpd service to run as non root user
  • nixos/httpd: allow user to specify a minimal list of apache modules
    • currently no way to remove unwanted/unneeded apache mod_ modules
    • in security certain restricted environments a goal is to reduce the number of apache modules to a bare minimum and any extra modules (mod_dav, for example) present an unacceptable security risk
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 nix-review --run "nix-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.
Notify maintainers

cc @

@aanderse
Copy link
Member Author

aanderse commented Nov 4, 2019

@GrahamcOfBorg test proxy

@aanderse aanderse changed the title Httpd again nixos/httpd: module cleanup Nov 4, 2019
@aanderse
Copy link
Member Author

aanderse commented Nov 6, 2019

@jglukasik any interest in testing and approving?

flokli
flokli approved these changes Nov 6, 2019
View reviewed changes
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.

I agree with the changes in here (but haven't tested myself).

Thanks a lot for doing this!

We might want to also drop logDir, and use LogsDirectory aswell.

@aanderse
Copy link
Member Author

aanderse commented Nov 6, 2019

The plan is to use journald when next release of apache is out. More changes coming down the pipe and I plan to address the logDir soon.

Thanks!

@aanderse aanderse merged commit dec234f into NixOS:master Nov 6, 2019
@aanderse aanderse deleted the httpd-again branch November 6, 2019 21:04
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Nov 7, 2019
@aanderse @dtzWill
Merge pull request NixOS#72789 from aanderse/httpd-again
90571a7 
nixos/httpd: module cleanup

(cherry picked from commit dec234f)
redvers added a commit to redvers/nixpkgs that referenced this pull request Nov 9, 2019
@redvers
nixos/httpd: module fixes enableUserDir (attendum to NixOS#72789)
62e421f
aanderse added a commit that referenced this pull request Nov 9, 2019
@aanderse
Merge pull request #73086 from redvers/httpd-module-enableUserDir-fix
8496f95 
nixos/httpd: module fixes enableUserDir (attendum to #72789)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli approved these changes

@fpletz fpletz Awaiting requested review from fpletz

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@aanderse @flokli