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/nginx: add upstreams examples #118447

Merged
merged 4 commits into from Apr 16, 2021
Merged

nixos/nginx: add upstreams examples #118447

merged 4 commits into from Apr 16, 2021

Conversation

SuperSandro2000
Copy link
Member

I am not fully sure if they are fully correct but they deployed the right syntax.

Motivation for this change
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.

@SuperSandro2000
nixos/nginx: add upstreams examples
ac3abec 
I am not fully sure if they are fully correct but they deployed the right syntax.
Ma27
Ma27 reviewed Apr 9, 2021
View reviewed changes
nixos/modules/services/web-servers/nginx/default.nix Outdated
@@ -676,6 +677,14 @@ in
Defines a group of servers to use as proxy target.
'';
default = {};
example = {
Copy link
Member

Choose a reason for hiding this comment

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

May be better to use literalExample here: this has better rendering in the manual.

aanderse
aanderse approved these changes Apr 14, 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.

LGTM 👍, as long as @Ma27 agrees.

@SuperSandro2000 SuperSandro2000 merged commit 0139874 into NixOS:master Apr 16, 2021
@SuperSandro2000 SuperSandro2000 deleted the SuperSandro2000-patch-5 branch April 16, 2021 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 left review comments

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@SuperSandro2000 @Ma27 @aanderse