summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-12-25 00:21:54 +0100
committermakefu <github@syntax-fehler.de>2016-12-25 00:21:54 +0100
commit3682e60aee26578f3163920b9feab641b21f5e5c (patch)
tree950291daf29fcb9a17a74182ffd58700312aa635 /krebs
parent83ca6e1879f89c9fbc8a64442debb1f0c0a057c1 (diff)
k 3 bepasty-server: finish krebs.nginx -> servers.nginx
Diffstat (limited to 'krebs')
-rw-r--r--krebs/3modules/bepasty-server.nix32
1 files changed, 17 insertions, 15 deletions
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