nginx: formating the config file #56280
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@GrahamcOfBorg test nginx nginx-sso |
|
Thanks! |
|
@Izorkin Thanks, sometimes it's nice to have a more readable config. Most often it doesn't matter... But when you need it it's very handy. |
infinisil
reviewed
Feb 24, 2019
| @@ -44,7 +44,25 @@ let | |||
| } | |||
| '')); | |||
|
|
|||
| configFile = pkgs.writeText "nginx.conf" '' | |||
| awkFormat = pkgs.writeText "awkFormat-nginx.awk" '' | |||
There was a problem hiding this comment.
I usually prefer builtins.toFile when the file is constant, because then there's one less derivation to build.
| phases = [ "installPhase" ]; | ||
| installPhase = '' | ||
| mkdir $out | ||
| awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out/nginx.conf |
There was a problem hiding this comment.
There's pkgs.runCommand when you only need to run a command.
And you can output the file directly to $out, no need to make it a folder.
10 tasks
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Formating the config file with awk to readable format.
Used this script - https://github.com/nixcloud/nixcloud-webservices/blob/master/modules/web/webserver/lib/nginx_check_config.nix
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)