public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "nginx: Format the config file"

Browse Source 
This reverts commit e362a3d5c94ba379d428fbd2cc40470719a61556.

See #22883
This commit is contained in:
Robin Gloster 2017-02-16 22:43:49 +01:00
parent 96c152f98e
commit 6e12406e30
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -16,20 +16,7 @@ let
) cfg.virtualHosts; ) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6; enableIPv6 = config.networking.enableIPv6;
configFile = pkgs.runCommand "nginx.conf" { configFile = pkgs.writeText "nginx.conf" ''
inherit configFileUnformatted;
passAsFile = [ "configFileUnformatted" ];
# configFileUnformatted is created locally, therefore so should this be.
preferLocalBuild = true;
allowSubstitutes = false;
} ''
cp ${configFileUnformatted} nginx.conf
chmod u+w nginx.conf
${pkgs.nginx-config-formatter}/bin/nginxfmt nginx.conf
cp nginx.conf $out
'';
configFileUnformatted = pkgs.writeText "nginx.unformatted.conf" ''
user ${cfg.user} ${cfg.group}; user ${cfg.user} ${cfg.group};
error_log stderr; error_log stderr;
daemon off; daemon off;