commit 71ae33edd3fda7d1e72b09740d99a988a6bad1fa · pyrox.dev/nixpkgs

+20 -2

nixos/modules/services/web-apps/dependency-track.nix

···

       509
       509
        
             upstreams.dependency-track.servers."localhost:${toString cfg.port}" = { };

     

       510
       510
        
             virtualHosts.${cfg.nginx.domain} = {

     

       511
       511
        
               locations = {

     

       512
       512
       -
                 "/".alias = "${cfg.package.frontend}/dist/";

     

       512
       512
       +
                 "/" = {

     

       513
       513
       +
                   alias = "${cfg.package.frontend}/dist/";

     

       514
       514
       +
                   index = "index.html";

     

       515
       515
       +
                   tryFiles = "$uri $uri/ /index.html";

     

       516
       516
       +
                   extraConfig = ''

     

       517
       517
       +
                     location ~ (index\.html)$ {

     

       518
       518
       +
                       add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate";

     

       519
       519
       +
                       add_header Pragma "no-cache";

     

       520
       520
       +
                       add_header Expires 0;

     

       521
       521
       +
                     }

     

       522
       522
       +
                   '';

     

       523
       523
       +
                 };

     

       513
       524
        
                 "/api".proxyPass = "http://dependency-track";

     

       514
       514
       -
                 "= /static/config.json".alias = frontendConfigFile;

     

       525
       525
       +
                 "= /static/config.json" = {

     

       526
       526
       +
                   alias = frontendConfigFile;

     

       527
       527
       +
                   extraConfig = ''

     

       528
       528
       +
                     add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate";

     

       529
       529
       +
                     add_header Pragma "no-cache";

     

       530
       530
       +
                     add_header Expires 0;

     

       531
       531
       +
                   '';

     

       532
       532
       +
                 };

     

       515
       533
        
               };

     

       516
       534
        
             };

     

       517
       535
        
           };

+19 -14

nixos/tests/dependency-track.nix

···

       45
       45
        
               };

     

       46
       46
        
           };

     

       47
       47
        
       

     

       48
       48
       -
           testScript = ''

     

       49
       49
       -
             import json

     

       48
       48
       +
           testScript =

     

       49
       49
       +
             # python

     

       50
       50
       +
             ''

     

       51
       51
       +
               import json

     

       52
       52
       +
       

     

       53
       53
       +
               start_all()

     

       50
       54
        
       

     

       51
       51
       -
             start_all()

     

       55
       55
       +
               server.wait_for_unit("dependency-track.service")

     

       56
       56
       +
               server.wait_until_succeeds(

     

       57
       57
       +
                 "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'"

     

       58
       58
       +
               )

     

       59
       59
       +
               server.wait_for_open_port(${toString dependencyTrackPort})

     

       52
       60
        
       

     

       53
       53
       -
             server.wait_for_unit("dependency-track.service")

     

       54
       54
       -
             server.wait_until_succeeds(

     

       55
       55
       -
               "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'"

     

       56
       56
       -
             )

     

       57
       57
       -
             server.wait_for_open_port(${toString dependencyTrackPort})

     

       61
       61
       +
               with subtest("version api returns correct version"):

     

       62
       62
       +
                 version = json.loads(

     

       63
       63
       +
                   server.succeed("curl http://localhost/api/version")

     

       64
       64
       +
                 )

     

       65
       65
       +
                 assert version["version"] == "${pkgs.dependency-track.version}"

     

       58
       66
        
       

     

       59
       59
       -
             with subtest("version api returns correct version"):

     

       60
       60
       -
               version = json.loads(

     

       61
       61
       -
                 server.succeed("curl http://localhost/api/version")

     

       62
       62
       -
               )

     

       63
       63
       -
               assert version["version"] == "${pkgs.dependency-track.version}"

     

       64
       64
       -
           '';

     

       67
       67
       +
               with subtest("nginx serves frontend"):

     

       68
       68
       +
                 server.succeed("curl http://localhost/ | grep \"<title>Dependency-Track</title>\"")

     

       69
       69
       +
             '';

     

       65
       70
        
         }

     

       66
       71
        
       )