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.

Sign up for GitHub

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/caddy: support user and group options #122647

Merged
merged 1 commit into from
May 16, 2021
Merged

nixos/caddy: support user and group options #122647

merged 1 commit into from
May 16, 2021

Conversation

onny
Copy link
Contributor

@onny onny commented May 11, 2021

Motivation for this change

Support changing user and group of the caddy web server process. This change was necessary for me to future support of further web servers like caddy in modules like Wordpress or Dokuwiki, see for example this pull request. These concepts to support multiple web servers depend on quering the user and group name of the web server to fix all other file permission things.

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.

@github-actions github-actions 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/` labels May 11, 2021
@onny onny requested review from flokli, lf- and Br1ght0ne May 11, 2021 21:54
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 11, 2021
aanderse
aanderse requested changes May 12, 2021
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.

Hi! Thanks for the PR. I have highlighted a few issues which should be easy enough to sort out. Let me know if you need a hand. Out of curiosity what value were you thinking to provide for user and group?

nixos/modules/services/web-servers/caddy.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-servers/caddy.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-servers/caddy.nix Outdated Show resolved Hide resolved
nixos/modules/services/web-servers/caddy.nix Outdated Show resolved Hide resolved
@onny
Copy link
Contributor Author

onny commented May 13, 2021

Thank you for this helpful feedback. I fixed the issues and took the concept from Nginx service here.

@aanderse
Copy link
Member

@GrahamcOfBorg test caddy

@aanderse
Copy link
Member

@onny looks good to merge. Can you please squash?

@onny
Copy link
Contributor Author

onny commented May 16, 2021

@onny looks good to merge. Can you please squash?

done :)

@onny onny mentioned this pull request May 16, 2021
Closed
10 tasks
@aanderse aanderse merged commit 21f5dd5 into NixOS:master May 16, 2021
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

@flokli flokli Awaiting requested review from flokli

@lf- lf- Awaiting requested review from lf-

@Br1ght0ne Br1ght0ne Awaiting requested review from Br1ght0ne

Assignees
No one assigned
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 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@onny @aanderse