commit c9947f03d16c5a62e8b26302876b36c5a585af0a · pyrox.dev/nixpkgs

+8 -8

nixos/tests/all-tests.nix

···

       797
       797
        
         nfs3 = handleTest ./nfs { version = 3; };

     

       798
       798
        
         nfs4 = handleTest ./nfs { version = 4; };

     

       799
       799
        
         nghttpx = handleTest ./nghttpx.nix {};

     

       800
       800
       -
         nginx = handleTest ./nginx.nix {};

     

       801
       801
       -
         nginx-auth = handleTest ./nginx-auth.nix {};

     

       802
       802
       -
         nginx-etag = handleTest ./nginx-etag.nix {};

     

       803
       803
       -
         nginx-etag-compression = handleTest ./nginx-etag-compression.nix {};

     

       804
       804
       -
         nginx-globalredirect = handleTest ./nginx-globalredirect.nix {};

     

       800
       800
       +
         nginx = runTest ./nginx.nix;

     

       801
       801
       +
         nginx-auth = runTest ./nginx-auth.nix;

     

       802
       802
       +
         nginx-etag = runTest ./nginx-etag.nix;

     

       803
       803
       +
         nginx-etag-compression = runTest ./nginx-etag-compression.nix;

     

       804
       804
       +
         nginx-globalredirect = runTest ./nginx-globalredirect.nix;

     

       805
       805
        
         nginx-http3 = handleTest ./nginx-http3.nix {};

     

       806
       806
       -
         nginx-mime = handleTest ./nginx-mime.nix {};

     

       807
       807
       -
         nginx-modsecurity = handleTest ./nginx-modsecurity.nix {};

     

       808
       808
       -
         nginx-moreheaders = handleTest ./nginx-moreheaders.nix {};

     

       806
       806
       +
         nginx-mime = runTest ./nginx-mime.nix;

     

       807
       807
       +
         nginx-modsecurity = runTest ./nginx-modsecurity.nix;

     

       808
       808
       +
         nginx-moreheaders = runTest ./nginx-moreheaders.nix;

     

       809
       809
        
         nginx-njs = handleTest ./nginx-njs.nix {};

     

       810
       810
        
         nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {};

     

       811
       811
        
         nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};

+44 -46

nixos/tests/nginx-auth.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-auth";

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-auth";

     

       5
       4
        
       

     

       6
       6
       -
           nodes = {

     

       7
       7
       -
             webserver =

     

       8
       8
       -
               { pkgs, lib, ... }:

     

       9
       9
       -
               {

     

       10
       10
       -
                 services.nginx =

     

       11
       11
       -
                   let

     

       12
       12
       -
                     root = pkgs.runCommand "testdir" { } ''

     

       13
       13
       -
                       mkdir "$out"

     

       14
       14
       -
                       echo hello world > "$out/index.html"

     

       15
       15
       -
                     '';

     

       16
       16
       -
                   in

     

       17
       17
       -
                   {

     

       18
       18
       -
                     enable = true;

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           webserver =

     

       7
       7
       +
             { pkgs, lib, ... }:

     

       8
       8
       +
             {

     

       9
       9
       +
               services.nginx =

     

       10
       10
       +
                 let

     

       11
       11
       +
                   root = pkgs.runCommand "testdir" { } ''

     

       12
       12
       +
                     mkdir "$out"

     

       13
       13
       +
                     echo hello world > "$out/index.html"

     

       14
       14
       +
                   '';

     

       15
       15
       +
                 in

     

       16
       16
       +
                 {

     

       17
       17
       +
                   enable = true;

     

       19
       18
        
       

     

       20
       20
       -
                     virtualHosts.lockedroot = {

     

       21
       21
       -
                       inherit root;

     

       22
       22
       -
                       basicAuth.alice = "pwofa";

     

       23
       23
       -
                     };

     

       19
       19
       +
                   virtualHosts.lockedroot = {

     

       20
       20
       +
                     inherit root;

     

       21
       21
       +
                     basicAuth.alice = "pwofa";

     

       22
       22
       +
                   };

     

       24
       23
        
       

     

       25
       25
       -
                     virtualHosts.lockedsubdir = {

     

       26
       26
       -
                       inherit root;

     

       27
       27
       -
                       locations."/sublocation/" = {

     

       28
       28
       -
                         alias = "${root}/";

     

       29
       29
       -
                         basicAuth.bob = "pwofb";

     

       30
       30
       -
                       };

     

       24
       24
       +
                   virtualHosts.lockedsubdir = {

     

       25
       25
       +
                     inherit root;

     

       26
       26
       +
                     locations."/sublocation/" = {

     

       27
       27
       +
                       alias = "${root}/";

     

       28
       28
       +
                       basicAuth.bob = "pwofb";

     

       31
       29
        
                     };

     

       32
       30
        
                   };

     

       33
       33
       -
               };

     

       34
       34
       -
           };

     

       31
       31
       +
                 };

     

       32
       32
       +
             };

     

       33
       33
       +
         };

     

       35
       34
        
       

     

       36
       36
       -
           testScript = ''

     

       37
       37
       -
             webserver.wait_for_unit("nginx")

     

       38
       38
       -
             webserver.wait_for_open_port(80)

     

       35
       35
       +
         testScript = ''

     

       36
       36
       +
           webserver.wait_for_unit("nginx")

     

       37
       37
       +
           webserver.wait_for_open_port(80)

     

       39
       38
        
       

     

       40
       40
       -
             webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")

     

       41
       41
       -
             webserver.succeed(

     

       42
       42
       -
                 "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"

     

       43
       43
       -
             )

     

       39
       39
       +
           webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot")

     

       40
       40
       +
           webserver.succeed(

     

       41
       41
       +
               "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot"

     

       42
       42
       +
           )

     

       44
       43
        
       

     

       45
       45
       -
             webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")

     

       46
       46
       -
             webserver.fail(

     

       47
       47
       -
                 "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"

     

       48
       48
       -
             )

     

       49
       49
       -
             webserver.succeed(

     

       50
       50
       -
                 "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"

     

       51
       51
       -
             )

     

       52
       52
       -
           '';

     

       53
       53
       -
         }

     

       54
       54
       -
       )

     

       44
       44
       +
           webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir")

     

       45
       45
       +
           webserver.fail(

     

       46
       46
       +
               "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html"

     

       47
       47
       +
           )

     

       48
       48
       +
           webserver.succeed(

     

       49
       49
       +
               "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html"

     

       50
       50
       +
           )

     

       51
       51
       +
         '';

     

       52
       52
       +
       }

+2 -1

nixos/tests/nginx-etag-compression.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-etag-compression";

     

       3
       4
        
       

     

       4
       5
        
         nodes.machine =

+3 -2

nixos/tests/nginx-etag.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-etag";

     

       3
       4
        
       

     

       4
       5
        
         nodes = {

     
···

       85
       86
        
         testScript =

     

       86
       87
        
           { nodes, ... }:

     

       87
       88
        
           let

     

       88
       88
       -
             inherit (nodes.server.config.system.build) toplevel;

     

       89
       89
       +
             inherit (nodes.server.system.build) toplevel;

     

       89
       90
        
             newSystem = "${toplevel}/specialisation/pass-checks";

     

       90
       91
        
           in

     

       91
       92
        
           ''

+22 -24

nixos/tests/nginx-globalredirect.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-globalredirect";

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-globalredirect";

     

       5
       4
        
       

     

       6
       6
       -
           nodes = {

     

       7
       7
       -
             webserver =

     

       8
       8
       -
               { pkgs, lib, ... }:

     

       9
       9
       -
               {

     

       10
       10
       -
                 services.nginx = {

     

       11
       11
       -
                   enable = true;

     

       12
       12
       -
                   virtualHosts.localhost = {

     

       13
       13
       -
                     globalRedirect = "other.example.com";

     

       14
       14
       -
                     # Add an exception

     

       15
       15
       -
                     locations."/noredirect".return = "200 'foo'";

     

       16
       16
       -
                   };

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           webserver =

     

       7
       7
       +
             { pkgs, lib, ... }:

     

       8
       8
       +
             {

     

       9
       9
       +
               services.nginx = {

     

       10
       10
       +
                 enable = true;

     

       11
       11
       +
                 virtualHosts.localhost = {

     

       12
       12
       +
                   globalRedirect = "other.example.com";

     

       13
       13
       +
                   # Add an exception

     

       14
       14
       +
                   locations."/noredirect".return = "200 'foo'";

     

       17
       15
        
                 };

     

       18
       16
        
               };

     

       19
       19
       -
           };

     

       17
       17
       +
             };

     

       18
       18
       +
         };

     

       20
       19
        
       

     

       21
       21
       -
           testScript = ''

     

       22
       22
       -
             webserver.wait_for_unit("nginx")

     

       23
       23
       -
             webserver.wait_for_open_port(80)

     

       20
       20
       +
         testScript = ''

     

       21
       21
       +
           webserver.wait_for_unit("nginx")

     

       22
       22
       +
           webserver.wait_for_open_port(80)

     

       24
       23
        
       

     

       25
       25
       -
             webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")

     

       26
       26
       -
             webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")

     

       27
       27
       -
           '';

     

       28
       28
       -
         }

     

       29
       29
       -
       )

     

       24
       24
       +
           webserver.succeed("curl --fail -si http://localhost/alf | grep '^Location:.*/alf'")

     

       25
       25
       +
           webserver.fail("curl --fail -si http://localhost/noredirect | grep '^Location:'")

     

       26
       26
       +
         '';

     

       27
       27
       +
       }

+21 -23

nixos/tests/nginx-mime.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { lib, pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-mime";

     

       5
       5
       -
           meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

     

       1
       1
       +
       { lib, pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-mime";

     

       4
       4
       +
         meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];

     

       6
       5
        
       

     

       7
       7
       -
           nodes = {

     

       8
       8
       -
             server =

     

       9
       9
       -
               { pkgs, ... }:

     

       10
       10
       -
               {

     

       11
       11
       -
                 services.nginx = {

     

       12
       12
       -
                   enable = true;

     

       13
       13
       -
                   virtualHosts."localhost" = { };

     

       14
       14
       -
                 };

     

       6
       6
       +
         nodes = {

     

       7
       7
       +
           server =

     

       8
       8
       +
             { pkgs, ... }:

     

       9
       9
       +
             {

     

       10
       10
       +
               services.nginx = {

     

       11
       11
       +
                 enable = true;

     

       12
       12
       +
                 virtualHosts."localhost" = { };

     

       15
       13
        
               };

     

       16
       16
       -
           };

     

       14
       14
       +
             };

     

       15
       15
       +
         };

     

       17
       16
        
       

     

       18
       18
       -
           testScript = ''

     

       19
       19
       -
             server.start()

     

       20
       20
       -
             server.wait_for_unit("nginx")

     

       21
       21
       -
             # Check optimal size of types_hash

     

       22
       22
       -
             server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")

     

       23
       23
       -
             server.shutdown()

     

       24
       24
       -
           '';

     

       25
       25
       -
         }

     

       26
       26
       -
       )

     

       17
       17
       +
         testScript = ''

     

       18
       18
       +
           server.start()

     

       19
       19
       +
           server.wait_for_unit("nginx")

     

       20
       20
       +
           # Check optimal size of types_hash

     

       21
       21
       +
           server.fail("journalctl --unit nginx --grep 'could not build optimal types_hash'")

     

       22
       22
       +
           server.shutdown()

     

       23
       23
       +
         '';

     

       24
       24
       +
       }

+45 -47

nixos/tests/nginx-modsecurity.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "nginx-modsecurity";

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "nginx-modsecurity";

     

       5
       4
        
       

     

       6
       6
       -
           nodes.machine =

     

       7
       7
       -
             {

     

       8
       8
       -
               config,

     

       9
       9
       -
               lib,

     

       10
       10
       -
               pkgs,

     

       11
       11
       -
               ...

     

       12
       12
       -
             }:

     

       13
       13
       -
             {

     

       14
       14
       -
               services.nginx = {

     

       15
       15
       -
                 enable = true;

     

       16
       16
       -
                 additionalModules = [ pkgs.nginxModules.modsecurity ];

     

       17
       17
       -
                 virtualHosts.localhost =

     

       18
       18
       -
                   let

     

       19
       19
       -
                     modsecurity_conf = pkgs.writeText "modsecurity.conf" ''

     

       20
       20
       -
                       SecRuleEngine On

     

       21
       21
       -
                       SecDefaultAction "phase:1,log,auditlog,deny,status:403"

     

       22
       22
       -
                       SecDefaultAction "phase:2,log,auditlog,deny,status:403"

     

       23
       23
       -
                       SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"

     

       24
       24
       -
                       SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"

     

       25
       25
       -
                     '';

     

       26
       26
       -
                     testroot = pkgs.runCommand "testroot" { } ''

     

       27
       27
       -
                       mkdir -p $out

     

       28
       28
       -
                       echo "<html><body>Hello World!</body></html>" > $out/index.html

     

       29
       29
       -
                       echo "s3cret" > $out/secret.html

     

       30
       30
       -
                     '';

     

       31
       31
       -
                   in

     

       32
       32
       -
                   {

     

       33
       33
       -
                     root = testroot;

     

       34
       34
       -
                     extraConfig = ''

     

       35
       35
       -
                       modsecurity on;

     

       36
       36
       -
                       modsecurity_rules_file ${modsecurity_conf};

     

       37
       37
       -
                     '';

     

       38
       38
       -
                   };

     

       39
       39
       -
               };

     

       5
       5
       +
         nodes.machine =

     

       6
       6
       +
           {

     

       7
       7
       +
             config,

     

       8
       8
       +
             lib,

     

       9
       9
       +
             pkgs,

     

       10
       10
       +
             ...

     

       11
       11
       +
           }:

     

       12
       12
       +
           {

     

       13
       13
       +
             services.nginx = {

     

       14
       14
       +
               enable = true;

     

       15
       15
       +
               additionalModules = [ pkgs.nginxModules.modsecurity ];

     

       16
       16
       +
               virtualHosts.localhost =

     

       17
       17
       +
                 let

     

       18
       18
       +
                   modsecurity_conf = pkgs.writeText "modsecurity.conf" ''

     

       19
       19
       +
                     SecRuleEngine On

     

       20
       20
       +
                     SecDefaultAction "phase:1,log,auditlog,deny,status:403"

     

       21
       21
       +
                     SecDefaultAction "phase:2,log,auditlog,deny,status:403"

     

       22
       22
       +
                     SecRule REQUEST_METHOD   "HEAD"        "id:100, phase:1, block"

     

       23
       23
       +
                     SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block"

     

       24
       24
       +
                   '';

     

       25
       25
       +
                   testroot = pkgs.runCommand "testroot" { } ''

     

       26
       26
       +
                     mkdir -p $out

     

       27
       27
       +
                     echo "<html><body>Hello World!</body></html>" > $out/index.html

     

       28
       28
       +
                     echo "s3cret" > $out/secret.html

     

       29
       29
       +
                   '';

     

       30
       30
       +
                 in

     

       31
       31
       +
                 {

     

       32
       32
       +
                   root = testroot;

     

       33
       33
       +
                   extraConfig = ''

     

       34
       34
       +
                     modsecurity on;

     

       35
       35
       +
                     modsecurity_rules_file ${modsecurity_conf};

     

       36
       36
       +
                   '';

     

       37
       37
       +
                 };

     

       40
       38
        
             };

     

       41
       41
       -
           testScript = ''

     

       42
       42
       -
             machine.wait_for_unit("nginx")

     

       39
       39
       +
           };

     

       40
       40
       +
         testScript = ''

     

       41
       41
       +
           machine.wait_for_unit("nginx")

     

       43
       42
        
       

     

       44
       44
       -
             response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")

     

       45
       45
       -
             assert "Hello World!" in response

     

       43
       43
       +
           response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/")

     

       44
       44
       +
           assert "Hello World!" in response

     

       46
       45
        
       

     

       47
       47
       -
             machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")

     

       48
       48
       -
             machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")

     

       49
       49
       -
           '';

     

       50
       50
       -
         }

     

       51
       51
       -
       )

     

       46
       46
       +
           machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/")

     

       47
       47
       +
           machine.fail("curl -fvvv -s http://127.0.0.1/secret.html")

     

       48
       48
       +
         '';

     

       49
       49
       +
       }

+2 -1

nixos/tests/nginx-moreheaders.nix

···

       1
       1
       -
       import ./make-test-python.nix {

     

       1
       1
       +
       { ... }:

     

       2
       2
       +
       {

     

       2
       3
        
         name = "nginx-more-headers";

     

       3
       4
        
       

     

       4
       5
        
         nodes = {

+119 -103

nixos/tests/nginx.nix

···

       4
       4
        
       #   2. whether the ETag header is properly generated whenever we're serving

     

       5
       5
        
       #      files in Nix store paths

     

       6
       6
        
       #   3. nginx doesn't restart on configuration changes (only reloads)

     

       7
       7
       -
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       7
       7
       +
       { pkgs, ... }:

     

       8
       8
       +
       {

     

       8
       9
        
         name = "nginx";

     

       9
       10
        
         meta = with pkgs.lib.maintainers; {

     

       10
       10
       -
           maintainers = [ mbbx6spp danbst ];

     

       11
       11
       +
           maintainers = [

     

       12
       12
       +
             mbbx6spp

     

       13
       13
       +
             danbst

     

       14
       14
       +
           ];

     

       11
       15
        
         };

     

       12
       16
        
       

     

       13
       17
        
         nodes = {

     

       14
       14
       -
           webserver = { pkgs, lib, ... }: {

     

       15
       15
       -
             services.nginx.enable = true;

     

       16
       16
       -
             services.nginx.commonHttpConfig = ''

     

       17
       17
       -
               log_format ceeformat '@cee: {"status":"$status",'

     

       18
       18
       -
                 '"request_time":$request_time,'

     

       19
       19
       -
                 '"upstream_response_time":$upstream_response_time,'

     

       20
       20
       -
                 '"pipe":"$pipe","bytes_sent":$bytes_sent,'

     

       21
       21
       -
                 '"connection":"$connection",'

     

       22
       22
       -
                 '"remote_addr":"$remote_addr",'

     

       23
       23
       -
                 '"host":"$host",'

     

       24
       24
       -
                 '"timestamp":"$time_iso8601",'

     

       25
       25
       -
                 '"request":"$request",'

     

       26
       26
       -
                 '"http_referer":"$http_referer",'

     

       27
       27
       -
                 '"upstream_addr":"$upstream_addr"}';

     

       28
       28
       -
             '';

     

       29
       29
       -
             services.nginx.virtualHosts."0.my.test" = {

     

       30
       30
       -
               extraConfig = ''

     

       31
       31
       -
                 access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;

     

       32
       32
       -
                 location /favicon.ico { allow all; access_log off; log_not_found off; }

     

       18
       18
       +
           webserver =

     

       19
       19
       +
             { pkgs, lib, ... }:

     

       20
       20
       +
             {

     

       21
       21
       +
               services.nginx.enable = true;

     

       22
       22
       +
               services.nginx.commonHttpConfig = ''

     

       23
       23
       +
                 log_format ceeformat '@cee: {"status":"$status",'

     

       24
       24
       +
                   '"request_time":$request_time,'

     

       25
       25
       +
                   '"upstream_response_time":$upstream_response_time,'

     

       26
       26
       +
                   '"pipe":"$pipe","bytes_sent":$bytes_sent,'

     

       27
       27
       +
                   '"connection":"$connection",'

     

       28
       28
       +
                   '"remote_addr":"$remote_addr",'

     

       29
       29
       +
                   '"host":"$host",'

     

       30
       30
       +
                   '"timestamp":"$time_iso8601",'

     

       31
       31
       +
                   '"request":"$request",'

     

       32
       32
       +
                   '"http_referer":"$http_referer",'

     

       33
       33
       +
                   '"upstream_addr":"$upstream_addr"}';

     

       33
       34
        
               '';

     

       34
       34
       -
             };

     

       35
       35
       +
               services.nginx.virtualHosts."0.my.test" = {

     

       36
       36
       +
                 extraConfig = ''

     

       37
       37
       +
                   access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;

     

       38
       38
       +
                   location /favicon.ico { allow all; access_log off; log_not_found off; }

     

       39
       39
       +
                 '';

     

       40
       40
       +
               };

     

       35
       41
        
       

     

       36
       36
       -
             services.nginx.virtualHosts.localhost = {

     

       37
       37
       -
               root = pkgs.runCommand "testdir" {} ''

     

       38
       38
       -
                 mkdir "$out"

     

       39
       39
       -
                 echo hello world > "$out/index.html"

     

       40
       40
       -
               '';

     

       41
       41
       -
             };

     

       42
       42
       +
               services.nginx.virtualHosts.localhost = {

     

       43
       43
       +
                 root = pkgs.runCommand "testdir" { } ''

     

       44
       44
       +
                   mkdir "$out"

     

       45
       45
       +
                   echo hello world > "$out/index.html"

     

       46
       46
       +
                 '';

     

       47
       47
       +
               };

     

       42
       48
        
       

     

       43
       43
       -
             services.nginx.enableReload = true;

     

       49
       49
       +
               services.nginx.enableReload = true;

     

       44
       50
        
       

     

       45
       45
       -
             specialisation.etagSystem.configuration = {

     

       46
       46
       -
               services.nginx.virtualHosts.localhost = {

     

       47
       47
       -
                 root = lib.mkForce (pkgs.runCommand "testdir2" {} ''

     

       48
       48
       -
                   mkdir "$out"

     

       49
       49
       -
                   echo content changed > "$out/index.html"

     

       50
       50
       -
                 '');

     

       51
       51
       +
               specialisation.etagSystem.configuration = {

     

       52
       52
       +
                 services.nginx.virtualHosts.localhost = {

     

       53
       53
       +
                   root = lib.mkForce (

     

       54
       54
       +
                     pkgs.runCommand "testdir2" { } ''

     

       55
       55
       +
                       mkdir "$out"

     

       56
       56
       +
                       echo content changed > "$out/index.html"

     

       57
       57
       +
                     ''

     

       58
       58
       +
                   );

     

       59
       59
       +
                 };

     

       51
       60
        
               };

     

       52
       52
       -
             };

     

       53
       61
        
       

     

       54
       54
       -
             specialisation.justReloadSystem.configuration = {

     

       55
       55
       -
               services.nginx.virtualHosts."1.my.test".listen = [ { addr = "127.0.0.1"; port = 8080; }];

     

       56
       56
       -
             };

     

       62
       62
       +
               specialisation.justReloadSystem.configuration = {

     

       63
       63
       +
                 services.nginx.virtualHosts."1.my.test".listen = [

     

       64
       64
       +
                   {

     

       65
       65
       +
                     addr = "127.0.0.1";

     

       66
       66
       +
                     port = 8080;

     

       67
       67
       +
                   }

     

       68
       68
       +
                 ];

     

       69
       69
       +
               };

     

       57
       70
        
       

     

       58
       58
       -
             specialisation.reloadRestartSystem.configuration = {

     

       59
       59
       -
               services.nginx.package = pkgs.nginxMainline;

     

       60
       60
       -
             };

     

       71
       71
       +
               specialisation.reloadRestartSystem.configuration = {

     

       72
       72
       +
                 services.nginx.package = pkgs.nginxMainline;

     

       73
       73
       +
               };

     

       61
       74
        
       

     

       62
       62
       -
             specialisation.reloadWithErrorsSystem.configuration = {

     

       63
       63
       -
               services.nginx.package = pkgs.nginxMainline;

     

       64
       64
       -
               services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";

     

       75
       75
       +
               specialisation.reloadWithErrorsSystem.configuration = {

     

       76
       76
       +
                 services.nginx.package = pkgs.nginxMainline;

     

       77
       77
       +
                 services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;";

     

       78
       78
       +
               };

     

       65
       79
        
             };

     

       66
       66
       -
           };

     

       67
       80
        
         };

     

       68
       81
        
       

     

       69
       69
       -
         testScript = { nodes, ... }: let

     

       70
       70
       -
           etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem";

     

       71
       71
       -
           justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem";

     

       72
       72
       -
           reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem";

     

       73
       73
       -
           reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem";

     

       74
       74
       -
         in ''

     

       75
       75
       -
           url = "http://localhost/index.html"

     

       82
       82
       +
         testScript =

     

       83
       83
       +
           { nodes, ... }:

     

       84
       84
       +
           let

     

       85
       85
       +
             etagSystem = "${nodes.webserver.system.build.toplevel}/specialisation/etagSystem";

     

       86
       86
       +
             justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/justReloadSystem";

     

       87
       87
       +
             reloadRestartSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadRestartSystem";

     

       88
       88
       +
             reloadWithErrorsSystem = "${nodes.webserver.system.build.toplevel}/specialisation/reloadWithErrorsSystem";

     

       89
       89
       +
           in

     

       90
       90
       +
           ''

     

       91
       91
       +
             url = "http://localhost/index.html"

     

       76
       92
        
       

     

       77
       93
        
       

     

       78
       78
       -
           def check_etag():

     

       79
       79
       -
               etag = webserver.succeed(

     

       80
       80
       -
                   f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'

     

       81
       81
       -
               ).rstrip()

     

       82
       82
       -
               http_code = webserver.succeed(

     

       83
       83
       -
                   f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"

     

       84
       84
       -
               )

     

       85
       85
       -
               assert http_code.split("\n")[-1] == "304"

     

       94
       94
       +
             def check_etag():

     

       95
       95
       +
                 etag = webserver.succeed(

     

       96
       96
       +
                     f'curl -v {url} 2>&1 | sed -n -e "s/^< etag: *//ip"'

     

       97
       97
       +
                 ).rstrip()

     

       98
       98
       +
                 http_code = webserver.succeed(

     

       99
       99
       +
                     f"curl -w '%{{http_code}}' --head --fail -H 'If-None-Match: {etag}' {url}"

     

       100
       100
       +
                 )

     

       101
       101
       +
                 assert http_code.split("\n")[-1] == "304"

     

       86
       102
        
       

     

       87
       87
       -
               return etag

     

       103
       103
       +
                 return etag

     

       88
       104
        
       

     

       89
       105
        
       

     

       90
       90
       -
           def wait_for_nginx_on_port(port):

     

       91
       91
       -
               webserver.wait_for_unit("nginx")

     

       92
       92
       -
               webserver.wait_for_open_port(port)

     

       106
       106
       +
             def wait_for_nginx_on_port(port):

     

       107
       107
       +
                 webserver.wait_for_unit("nginx")

     

       108
       108
       +
                 webserver.wait_for_open_port(port)

     

       93
       109
        
       

     

       94
       110
        
       

     

       95
       95
       -
           # nginx can be ready before multi-user.target, in which case switching to

     

       96
       96
       -
           # a different configuration might not realize it needs to restart nginx.

     

       97
       97
       -
           webserver.wait_for_unit("multi-user.target")

     

       111
       111
       +
             # nginx can be ready before multi-user.target, in which case switching to

     

       112
       112
       +
             # a different configuration might not realize it needs to restart nginx.

     

       113
       113
       +
             webserver.wait_for_unit("multi-user.target")

     

       98
       114
        
       

     

       99
       99
       -
           wait_for_nginx_on_port(80)

     

       115
       115
       +
             wait_for_nginx_on_port(80)

     

       100
       116
        
       

     

       101
       101
       -
           with subtest("check ETag if serving Nix store paths"):

     

       102
       102
       -
               old_etag = check_etag()

     

       103
       103
       -
               webserver.succeed(

     

       104
       104
       -
                   "${etagSystem}/bin/switch-to-configuration test >&2"

     

       105
       105
       -
               )

     

       106
       106
       -
               wait_for_nginx_on_port(80)

     

       107
       107
       -
               new_etag = check_etag()

     

       108
       108
       -
               assert old_etag != new_etag

     

       117
       117
       +
             with subtest("check ETag if serving Nix store paths"):

     

       118
       118
       +
                 old_etag = check_etag()

     

       119
       119
       +
                 webserver.succeed(

     

       120
       120
       +
                     "${etagSystem}/bin/switch-to-configuration test >&2"

     

       121
       121
       +
                 )

     

       122
       122
       +
                 wait_for_nginx_on_port(80)

     

       123
       123
       +
                 new_etag = check_etag()

     

       124
       124
       +
                 assert old_etag != new_etag

     

       109
       125
        
       

     

       110
       110
       -
           with subtest("config is reloaded on nixos-rebuild switch"):

     

       111
       111
       -
               webserver.succeed(

     

       112
       112
       -
                   "${justReloadSystem}/bin/switch-to-configuration test >&2"

     

       113
       113
       -
               )

     

       114
       114
       -
               wait_for_nginx_on_port(8080)

     

       115
       115
       -
               webserver.fail("journalctl -u nginx | grep -q -i stopped")

     

       116
       116
       -
               webserver.succeed("journalctl -u nginx | grep -q -i reloaded")

     

       126
       126
       +
             with subtest("config is reloaded on nixos-rebuild switch"):

     

       127
       127
       +
                 webserver.succeed(

     

       128
       128
       +
                     "${justReloadSystem}/bin/switch-to-configuration test >&2"

     

       129
       129
       +
                 )

     

       130
       130
       +
                 wait_for_nginx_on_port(8080)

     

       131
       131
       +
                 webserver.fail("journalctl -u nginx | grep -q -i stopped")

     

       132
       132
       +
                 webserver.succeed("journalctl -u nginx | grep -q -i reloaded")

     

       117
       133
        
       

     

       118
       118
       -
           with subtest("restart when nginx package changes"):

     

       119
       119
       -
               webserver.succeed(

     

       120
       120
       -
                   "${reloadRestartSystem}/bin/switch-to-configuration test >&2"

     

       121
       121
       -
               )

     

       122
       122
       -
               wait_for_nginx_on_port(80)

     

       123
       123
       -
               webserver.succeed("journalctl -u nginx | grep -q -i stopped")

     

       134
       134
       +
             with subtest("restart when nginx package changes"):

     

       135
       135
       +
                 webserver.succeed(

     

       136
       136
       +
                     "${reloadRestartSystem}/bin/switch-to-configuration test >&2"

     

       137
       137
       +
                 )

     

       138
       138
       +
                 wait_for_nginx_on_port(80)

     

       139
       139
       +
                 webserver.succeed("journalctl -u nginx | grep -q -i stopped")

     

       124
       140
        
       

     

       125
       125
       -
           with subtest("nixos-rebuild --switch should fail when there are configuration errors"):

     

       126
       126
       -
               webserver.fail(

     

       127
       127
       -
                   "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       128
       128
       -
               )

     

       129
       129
       -
               webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")

     

       130
       130
       -
               webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")

     

       131
       131
       -
               # just to make sure operation is idempotent. During development I had a situation

     

       132
       132
       -
               # when first time it shows error, but stops showing it on subsequent rebuilds

     

       133
       133
       -
               webserver.fail(

     

       134
       134
       -
                   "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       135
       135
       -
               )

     

       136
       136
       -
         '';

     

       137
       137
       -
       })

     

       141
       141
       +
             with subtest("nixos-rebuild --switch should fail when there are configuration errors"):

     

       142
       142
       +
                 webserver.fail(

     

       143
       143
       +
                     "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       144
       144
       +
                 )

     

       145
       145
       +
                 webserver.succeed("[[ $(systemctl is-failed nginx-config-reload) == failed ]]")

     

       146
       146
       +
                 webserver.succeed("[[ $(systemctl is-failed nginx) == active ]]")

     

       147
       147
       +
                 # just to make sure operation is idempotent. During development I had a situation

     

       148
       148
       +
                 # when first time it shows error, but stops showing it on subsequent rebuilds

     

       149
       149
       +
                 webserver.fail(

     

       150
       150
       +
                     "${reloadWithErrorsSystem}/bin/switch-to-configuration test >&2"

     

       151
       151
       +
                 )

     

       152
       152
       +
           '';

     

       153
       153
       +
       }