diff options
| author | Robin Gloster <mail@glob.in> | 2017-02-16 22:43:49 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-02-16 22:45:00 +0100 |
| commit | 6e12406e30b263ea7ce49a784c85f5a727b5fc8a (patch) | |
| tree | 382b56766dc153de7cceb4d92b6d29ec5e8070fd /nixos/modules/services/web-servers/nginx | |
| parent | 96c152f98eeffe3fd532dcd208479a01513b34f2 (diff) | |
| download | nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.tar nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.tar.gz nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.tar.bz2 nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.tar.lz nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.tar.xz nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.tar.zst nixlib-6e12406e30b263ea7ce49a784c85f5a727b5fc8a.zip | |
Revert "nginx: Format the config file"
This reverts commit e362a3d5c94ba379d428fbd2cc40470719a61556. See #22883
Diffstat (limited to 'nixos/modules/services/web-servers/nginx')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index aa11a5d5e80a..9e93e56b9c2c 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -16,20 +16,7 @@ let ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; - configFile = pkgs.runCommand "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" '' + configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; error_log stderr; daemon off; |