krebs 3 bepasty-server: styling

This commit is contained in:
makefu 2015-10-22 16:14:37 +02:00
parent 9bb3069f69
commit be39c6d849

View File

@ -10,7 +10,10 @@ let
out = { out = {
options.krebs.bepasty = api; options.krebs.bepasty = api;
config = mkIf cfg.enable (mkMerge [(mkIf cfg.serveNginx nginx-imp) imp ]) ; config = mkIf cfg.enable (mkMerge [
(mkIf cfg.serveNginx nginx-imp)
imp
]);
}; };
api = { api = {
@ -88,8 +91,7 @@ let
# Configures systemd services for each configured server # Configures systemd services for each configured server
# environment.systemPackages = [ bepasty gunicorn gevent ]; # environment.systemPackages = [ bepasty gunicorn gevent ];
systemd.services = mapAttrs' (name: server: systemd.services = mapAttrs' (name: server:
nameValuePair ("bepasty-server-${name}") nameValuePair "bepasty-server-${name}" {
({
description = "Bepasty Server ${name}"; description = "Bepasty Server ${name}";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
@ -98,6 +100,7 @@ let
BEPASTY_CONFIG = "${server.workDir}/bepasty-${name}.conf"; BEPASTY_CONFIG = "${server.workDir}/bepasty-${name}.conf";
PYTHONPATH= "${bepasty}/lib/${python.libPrefix}/site-packages:${gevent}/lib/${python.libPrefix}/site-packages"; PYTHONPATH= "${bepasty}/lib/${python.libPrefix}/site-packages:${gevent}/lib/${python.libPrefix}/site-packages";
}; };
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
PrivateTmp = true; PrivateTmp = true;
@ -123,7 +126,7 @@ let
-k gevent -k gevent
''; '';
}; };
}) }
) cfg.servers; ) cfg.servers;
users.extraUsers.bepasty = { users.extraUsers.bepasty = {
@ -147,18 +150,15 @@ let
client_max_body_size 32M; client_max_body_size 32M;
''; '';
locations = [ locations = [
(nameValuePair ("/") (nameValuePair "/" ''
(''
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_pass http://unix:${server.workDir}/gunicorn-${name}.sock; proxy_pass http://unix:${server.workDir}/gunicorn-${name}.sock;
'')) '')
(nameValuePair ("/static/") (nameValuePair "/static/" ''
(''
alias ${bepasty}/lib/${python.libPrefix}/site-packages/bepasty/static/; alias ${bepasty}/lib/${python.libPrefix}/site-packages/bepasty/static/;
'')) '')
]; ];
}]) }])) cfg.servers ;
) cfg.servers ;
}; };
in in
out out