diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-04-04 20:23:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 20:23:58 +0100 |
| commit | 6dd7483ce1b5100248668f4eee1c40724ba9d69d (patch) | |
| tree | abbb1a0a0dff4bd59871ff49d32da84169c67944 /nixos | |
| parent | fab50f0e915d6ab458ece3e7ecfa2bb4fd3212d4 (diff) | |
| parent | 59fac1a6d7e1983a1e7bd518129ff9ef39a013dd (diff) | |
| download | nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.tar nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.tar.gz nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.tar.bz2 nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.tar.lz nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.tar.xz nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.tar.zst nixlib-6dd7483ce1b5100248668f4eee1c40724ba9d69d.zip | |
Merge pull request #57979 from 4z3/writeNginxConfig
nixos/nginx: use nginxfmt and gixy
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index bf9f0c21aedf..3a154ab75ba9 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -44,19 +44,7 @@ let } '')); - awkFormat = builtins.toFile "awkFormat-nginx.awk" '' - awk -f - {sub(/^[ \t]+/,"");idx=0} - /\{/{ctx++;idx=1} - /\}/{ctx--} - {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0} - ''; - - configFile = pkgs.runCommand "nginx.conf" {} ('' - awk -f ${awkFormat} ${pre-configFile} | sed '/^\s*$/d' > $out - ''); - - pre-configFile = pkgs.writeText "pre-nginx.conf" '' + configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' user ${cfg.user} ${cfg.group}; error_log ${cfg.logError}; daemon off; |