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 fixes enableUserDir (attendum to #72789) #73086

Merged
merged 1 commit into from Nov 9, 2019
Merged

nixos/httpd: module fixes enableUserDir (attendum to #72789) #73086

merged 1 commit into from Nov 9, 2019

Conversation

redvers
Copy link
Member

@redvers redvers commented Nov 9, 2019

Motivation for this change

Previous commit to this module removed "userdir" from the list of automatically loaded modules. This module is needed to support the module's enableUserDir.

This PR adds the "userdir" module if enableUserDir is set to true.

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

aanderse
aanderse approved these changes Nov 9, 2019
View reviewed changes
Copy link
Member

@aanderse aanderse left a comment

Choose a reason for hiding this comment

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

Went back to check and it looks like only mod_userdir was missed. Thank you very much for catching (and fixing) this.

@aanderse aanderse merged commit 8496f95 into NixOS:master Nov 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanderse aanderse aanderse approved these changes

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
@redvers @aanderse