diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-15 15:27:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 15:27:31 +0200 |
| commit | 5bb17df5521d88c472f83e34bb6976b02376f6aa (patch) | |
| tree | d9b7690400a007fd35772c05cfe24ccba7011240 /nixos | |
| parent | 4897678f1d2f1229beb2818c6241d5a00147ec15 (diff) | |
| parent | b981ba288c463ea8e0f2d476e3bd8a9525e15d39 (diff) | |
Merge pull request #231705 from ambroisie/add-vikunja-port
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/web-apps/vikunja.nix | 8 | ||||
| -rw-r--r-- | nixos/tests/vikunja.nix | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/vikunja.nix b/nixos/modules/services/web-apps/vikunja.nix index c3552200d4e53..8bc8e8c29259e 100644 --- a/nixos/modules/services/web-apps/vikunja.nix +++ b/nixos/modules/services/web-apps/vikunja.nix @@ -56,6 +56,11 @@ in { type = types.str; 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 { type = format.type; @@ -101,6 +106,7 @@ in { inherit (cfg.database) type host user database path; }; service = { + interface = ":${toString cfg.port}"; frontendurl = "${cfg.frontendScheme}://${cfg.frontendHostname}/"; }; files = { @@ -132,7 +138,7 @@ in { tryFiles = "try_files $uri $uri/ /"; }; "~* ^/(api|dav|\\.well-known)/" = { - proxyPass = "http://localhost:3456"; + proxyPass = "http://localhost:${toString cfg.port}"; extraConfig = '' client_max_body_size 20M; ''; diff --git a/nixos/tests/vikunja.nix b/nixos/tests/vikunja.nix index 2f6c4c1f46617..2660aa9767ca7 100644 --- a/nixos/tests/vikunja.nix +++ b/nixos/tests/vikunja.nix @@ -26,6 +26,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; frontendScheme = "http"; frontendHostname = "localhost"; + port = 9090; }; services.postgresql = { enable = true; @@ -52,8 +53,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { vikunjaSqlite.succeed("curl --fail http://localhost") vikunjaPostgresql.wait_for_unit("vikunja-api.service") - vikunjaPostgresql.wait_for_open_port(3456) - vikunjaPostgresql.succeed("curl --fail http://localhost:3456/api/v1/info") + vikunjaPostgresql.wait_for_open_port(9090) + vikunjaPostgresql.succeed("curl --fail http://localhost:9090/api/v1/info") vikunjaPostgresql.wait_for_unit("nginx.service") vikunjaPostgresql.wait_for_open_port(80) |