From 3682e60aee26578f3163920b9feab641b21f5e5c Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 25 Dec 2016 00:21:54 +0100 Subject: k 3 bepasty-server: finish krebs.nginx -> servers.nginx --- krebs/3modules/bepasty-server.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'krebs') diff --git a/krebs/3modules/bepasty-server.nix b/krebs/3modules/bepasty-server.nix index 73d734237..4e035e725 100644 --- a/krebs/3modules/bepasty-server.nix +++ b/krebs/3modules/bepasty-server.nix @@ -48,6 +48,7 @@ let default = ""; }; + # we create a wsgi socket in $workDir/gunicorn-${name}.wsgi workDir = mkOption { type = types.str; @@ -155,21 +156,22 @@ let assertions = [{ assertion = config.services.nginx.enable; message = "services.nginx.enable must be true"; }]; - services.nginx.virtualHosts = mapAttrs ( server: - (mkMerge [ server.nginx { - extraConfig = '' - client_max_body_size 32M; - ''; - locations = { - "/" = '' - proxy_set_header Host $http_host; - proxy_pass http://unix:${server.workDir}/gunicorn-${name}.sock; - ''; - "/static/" = '' - alias ${bepasty}/lib/${python.libPrefix}/site-packages/bepasty/static/; - ''; - }; - }])) cfg.servers ; + services.nginx.virtualHosts = mapAttrs ( name: server: + (mkMerge [ + server.nginx + { + extraConfig = '' + client_max_body_size 32M; + ''; + locations = { + "/".extraConfig = "proxy_set_header Host $http_host;"; + "/".proxyPass = "http://unix:${server.workDir}/gunicorn-${name}.sock"; + "/static/".extraConfig = '' + alias ${bepasty}/lib/${python.libPrefix}/site-packages/bepasty/static/; + ''; + }; + }]) + ) cfg.servers ; }; in out -- cgit v1.2.3