Unverified Commit 5bb17df5 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents 4897678f b981ba28

nixos/modules/services/web-apps/vikunja.nix

+7 −1
Original line number Diff line number Diff line
@@ -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;

          '';

nixos/tests/vikunja.nix

+3 −2
Original line number Diff line number Diff line
@@ -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)