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

nginx: fix formating the config file #56335

Merged
merged 1 commit into from Feb 25, 2019
Merged

nginx: fix formating the config file #56335

merged 1 commit into from Feb 25, 2019

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Feb 25, 2019 •
edited

Motivation for this change

Fix this PR #56280

cc @etu

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@etu
Copy link
Contributor

etu commented Feb 25, 2019

@GrahamcOfBorg test nginx

@etu etu merged commit 0d3230f into NixOS:master Feb 25, 2019
@Izorkin
Copy link
Contributor Author

Izorkin commented Feb 25, 2019

Thanks!

@Izorkin Izorkin deleted the nginx-fix-config branch February 25, 2019 10:00
infinisil
infinisil reviewed Feb 25, 2019
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

When you open a new PR to fix things I mentioned in a review, you should ping me, there's still something that could have been done better..

nixos/modules/services/web-servers/nginx/default.nix
awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out/nginx.conf
'';
};
configFile = pkgs.runCommand "nginx.conf" {} (''
Copy link
Member

Choose a reason for hiding this comment

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

These parenthesis aren't needed

@infinisil
Copy link
Member

Also format your commit message according to the Contribution Guidelines, also linked to from the PR template in the future

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil left review comments

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
4 participants
@Izorkin @etu @infinisil @GrahamcOfBorg