nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-23 13:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nginx: Verify that configuration is syntactically correct" (#17337)

Browse Source
This commit is contained in:
Robin Gloster 2016-07-28 13:55:06 +02:00 committed by Rok Garbas
parent 62f2f72e98
commit 356c2fe00d
1 changed files with 3 additions and 12 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

@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.nginx;
nginx = cfg.package;
configFileText = ''
configFile = pkgs.writeText "nginx.conf" ''
user ${cfg.user} ${cfg.group};
daemon off;
@ -19,17 +19,6 @@ let
''}
${cfg.appendConfig}
'';
configFile = pkgs.runCommand "nginx.conf" {
text = configFileText;
passAsFile = ["text"];
preferLocalBuild = true;
allowSubstitutes = false;
} ''
mkdir -p "$(dirname "$out")"
mv "$textPath" "$out"
(${nginx}/bin/nginx -t -c "$out" -p ${cfg.stateDir} || true) 2>&1 | grep -q 'syntax is ok'
'';
in
{
@ -102,6 +91,8 @@ in
};
config = mkIf cfg.enable {
# TODO: test user supplied config file pases syntax test
systemd.services.nginx = {
description = "Nginx Web Server";
after = [ "network.target" ];