qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/gancio: use unix socket between nginx and gancio

Browse Source
This commit is contained in:
Jean-Baptiste Giraudeau 2024-09-09 15:20:59 +02:00
parent 58ec286785
commit 432bfec026
No known key found for this signature in database
GPG Key ID: 7CEF8C9CC2D9933B
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nixos/modules/services/web-apps/gancio.nix
View File

@ -59,19 +59,12 @@ in
description = "The URL path under which the server is reachable."; description = "The URL path under which the server is reachable.";
}; };
server = { server = {
host = mkOption { socket = mkOption {
type = types.str; type = types.path;
default = "localhost"; readOnly = true;
example = "::"; default = "/run/gancio/socket";
description = '' description = ''
The address (IPv4, IPv6 or DNS) for the gancio server to listen on. The unix socket for the gancio server to listen on.
'';
};
port = mkOption {
type = types.port;
default = 13120;
description = ''
Port number of the gancio server to listen on.
''; '';
}; };
}; };
@ -231,6 +224,10 @@ in
serviceConfig = { serviceConfig = {
ExecStart = "${getExe cfg.package} start ${configFile}"; ExecStart = "${getExe cfg.package} start ${configFile}";
# set umask so that nginx can write to the server socket
# FIXME: upstream socket permission configuration in Nuxt
UMask = "0002";
RuntimeDirectory = "gancio";
StateDirectory = "gancio"; StateDirectory = "gancio";
WorkingDirectory = "/var/lib/gancio"; WorkingDirectory = "/var/lib/gancio";
LogsDirectory = "gancio"; LogsDirectory = "gancio";
@ -274,12 +271,14 @@ in
}; };
"@proxy" = { "@proxy" = {
proxyWebsockets = true; proxyWebsockets = true;
proxyPass = "http://${cfg.settings.server.host}:${toString cfg.settings.server.port}"; proxyPass = "http://unix:${cfg.settings.server.socket}";
recommendedProxySettings = true; recommendedProxySettings = true;
}; };
}; };
} }
]; ];
}; };
# for nginx to access gancio socket
users.users."${config.services.nginx.user}".extraGroups = [ config.users.users.${cfg.user}.group ];
}; };
} }

2
nixos/tests/gancio.nix
View File

@ -71,7 +71,7 @@ import ./make-test-python.nix (
server.wait_for_unit("postgresql") server.wait_for_unit("postgresql")
server.wait_for_unit("gancio") server.wait_for_unit("gancio")
server.wait_for_unit("nginx") server.wait_for_unit("nginx")
server.wait_for_open_port(13120) server.wait_for_file("/run/gancio/socket")
server.wait_for_open_port(80) server.wait_for_open_port(80)
# Check can create user via cli # Check can create user via cli