diff options
| author | tv <tv@krebsco.de> | 2019-03-20 18:49:40 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2019-03-23 11:16:14 +0100 |
| commit | 59fac1a6d7e1983a1e7bd518129ff9ef39a013dd (patch) | |
| tree | 20d2278e6d9f85b65779d70b60c0cef186d6fbb5 | |
| parent | 7437268cd4962cb003198211063cfcda2703e01a (diff) | |
| download | nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.tar nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.tar.gz nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.tar.bz2 nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.tar.lz nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.tar.xz nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.tar.zst nixpkgs-59fac1a6d7e1983a1e7bd518129ff9ef39a013dd.zip | |
nixos/nginx: use writeNginxConfig
| -rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/nginx-config-formatter/default.nix | 6 |
2 files changed, 4 insertions, 16 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 1c9fbe048f8..e577e8a5012 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; diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index 37218f84868..e19eac1c51e 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - version = "2016-06-16"; + version = "2019-02-13"; name = "nginx-config-formatter-${version}"; src = fetchFromGitHub { owner = "1connect"; repo = "nginx-config-formatter"; - rev = "fe5c77d2a503644bebee2caaa8b222c201c0603d"; - sha256 = "0akpkbq5136k1i1z1ls6yksis35hbr70k8vd10laqwvr1jj41bga"; + rev = "4ea6bbc1bdeb1d28419548aeca90f323e64e0e05"; + sha256 = "0h6pj9i0wim9pzkafi92l1nhlnl2a530vnm7qqi3n2ra8iwfyw4f"; }; buildInputs = [ python3 ]; |