commit 5bb17df5521d88c472f83e34bb6976b02376f6aa · pyrox.dev/nixpkgs

+7 -1

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

···

       56
       56
        
             type = types.str;

     

       57
       57
        
             description = lib.mdDoc "The Hostname under which the frontend is running.";

     

       58
       58
        
           };

     

       59
       59
       +
           port = mkOption {

     

       60
       60
       +
             type = types.port;

     

       61
       61
       +
             default = 3456;

     

       62
       62
       +
             description = lib.mdDoc "The TCP port exposed by the API.";

     

       63
       63
       +
           };

     

       59
       64
        
       

     

       60
       65
        
           settings = mkOption {

     

       61
       66
        
             type = format.type;

     
···

       101
       106
        
               inherit (cfg.database) type host user database path;

     

       102
       107
        
             };

     

       103
       108
        
             service = {

     

       109
       109
       +
               interface = ":${toString cfg.port}";

     

       104
       110
        
               frontendurl = "${cfg.frontendScheme}://${cfg.frontendHostname}/";

     

       105
       111
        
             };

     

       106
       112
        
             files = {

     
···

       132
       138
        
                 tryFiles = "try_files $uri $uri/ /";

     

       133
       139
        
               };

     

       134
       140
        
               "~* ^/(api|dav|\\.well-known)/" = {

     

       135
       135
       -
                 proxyPass = "http://localhost:3456";

     

       141
       141
       +
                 proxyPass = "http://localhost:${toString cfg.port}";

     

       136
       142
        
                 extraConfig = ''

     

       137
       143
        
                   client_max_body_size 20M;

     

       138
       144
        
                 '';

+3 -2

nixos/tests/vikunja.nix

···

       26
       26
        
               };

     

       27
       27
        
               frontendScheme = "http";

     

       28
       28
        
               frontendHostname = "localhost";

     

       29
       29
       +
               port = 9090;

     

       29
       30
        
             };

     

       30
       31
        
             services.postgresql = {

     

       31
       32
        
               enable = true;

     
···

       52
       53
        
             vikunjaSqlite.succeed("curl --fail http://localhost")

     

       53
       54
        
       

     

       54
       55
        
             vikunjaPostgresql.wait_for_unit("vikunja-api.service")

     

       55
       55
       -
             vikunjaPostgresql.wait_for_open_port(3456)

     

       56
       56
       -
             vikunjaPostgresql.succeed("curl --fail http://localhost:3456/api/v1/info")

     

       56
       56
       +
             vikunjaPostgresql.wait_for_open_port(9090)

     

       57
       57
       +
             vikunjaPostgresql.succeed("curl --fail http://localhost:9090/api/v1/info")

     

       57
       58
        
       

     

       58
       59
        
             vikunjaPostgresql.wait_for_unit("nginx.service")

     

       59
       60
        
             vikunjaPostgresql.wait_for_open_port(80)