diff options
author | Elis Hirwing <elis@hirwing.se> | 2019-02-25 10:59:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-25 10:59:37 +0100 |
commit | 0d3230f3390baae0ee7a41e7994441ce78bd73f0 (patch) | |
tree | 62321943558d952a94d56c9a71d9c3514ea2e517 | |
parent | a36d2eac2efda14710ec19e45aeba799a511ef3a (diff) | |
parent | 569248b3c2fe6179d1cfd914b48899798f8f4b56 (diff) | |
download | nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.tar nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.tar.gz nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.tar.bz2 nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.tar.lz nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.tar.xz nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.tar.zst nixlib-0d3230f3390baae0ee7a41e7994441ce78bd73f0.zip |
Merge pull request #56335 from Izorkin/nginx-fix-config
nginx: fix formating the config file
-rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 89dc8b3795ef..f688bec1426d 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -44,7 +44,7 @@ let } '')); - awkFormat = pkgs.writeText "awkFormat-nginx.awk" '' + awkFormat = builtins.toFile "awkFormat-nginx.awk" '' awk -f {sub(/^[ \t]+/,"");idx=0} /\{/{ctx++;idx=1} @@ -52,15 +52,9 @@ let {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} ''; - configFile = pkgs.stdenv.mkDerivation { - name = "nginx-config"; - src = ""; - phases = [ "installPhase" ]; - installPhase = '' - mkdir $out - awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out/nginx.conf - ''; - }; + configFile = pkgs.runCommand "nginx.conf" {} ('' + awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out + ''); pre-configFile = pkgs.writeText "pre-nginx.conf" '' user ${cfg.user} ${cfg.group}; @@ -656,10 +650,10 @@ in preStart = '' ${cfg.preStart} - ${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir} -t + ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/nginx -c ${configFile}/nginx.conf -p ${cfg.stateDir}"; + ExecStart = "${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; RestartSec = "10s"; |