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

Merge pull request #231705 from ambroisie/add-vikunja-port

Browse Source
This commit is contained in:
Sandro
2023-05-15 15:27:31 +02:00
committed by GitHub
parent 4897678f1d b981ba288c
commit 5bb17df552
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/web-apps/vikunja.nix
View File

@@ -56,6 +56,11 @@ in {
type = types.str; type = types.str;
description = lib.mdDoc "The Hostname under which the frontend is running."; description = lib.mdDoc "The Hostname under which the frontend is running.";
}; };
port = mkOption {
type = types.port;
default = 3456;
description = lib.mdDoc "The TCP port exposed by the API.";
};
settings = mkOption { settings = mkOption {
type = format.type; type = format.type;
@@ -101,6 +106,7 @@ in {
inherit (cfg.database) type host user database path; inherit (cfg.database) type host user database path;
}; };
service = { service = {
interface = ":${toString cfg.port}";
frontendurl = "${cfg.frontendScheme}://${cfg.frontendHostname}/"; frontendurl = "${cfg.frontendScheme}://${cfg.frontendHostname}/";
}; };
files = { files = {
@@ -132,7 +138,7 @@ in {
tryFiles = "try_files $uri $uri/ /"; tryFiles = "try_files $uri $uri/ /";
}; };
"~* ^/(api|dav|\\.well-known)/" = { "~* ^/(api|dav|\\.well-known)/" = {
proxyPass = "http://localhost:3456"; proxyPass = "http://localhost:${toString cfg.port}";
extraConfig = '' extraConfig = ''
client_max_body_size 20M; client_max_body_size 20M;
''; '';

5
nixos/tests/vikunja.nix
View File

@@ -26,6 +26,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
}; };
frontendScheme = "http"; frontendScheme = "http";
frontendHostname = "localhost"; frontendHostname = "localhost";
port = 9090;
}; };
services.postgresql = { services.postgresql = {
enable = true; enable = true;
@@ -52,8 +53,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
vikunjaSqlite.succeed("curl --fail http://localhost") vikunjaSqlite.succeed("curl --fail http://localhost")
vikunjaPostgresql.wait_for_unit("vikunja-api.service") vikunjaPostgresql.wait_for_unit("vikunja-api.service")
vikunjaPostgresql.wait_for_open_port(3456) vikunjaPostgresql.wait_for_open_port(9090)
vikunjaPostgresql.succeed("curl --fail http://localhost:3456/api/v1/info") vikunjaPostgresql.succeed("curl --fail http://localhost:9090/api/v1/info")
vikunjaPostgresql.wait_for_unit("nginx.service") vikunjaPostgresql.wait_for_unit("nginx.service")
vikunjaPostgresql.wait_for_open_port(80) vikunjaPostgresql.wait_for_open_port(80)