commit c49b710acc86baa15ab0b48f7739fdccf20e4749 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1319
       1319
        
         stratis = handleTest ./stratis { };

     

       1320
       1320
        
         strongswan-swanctl = runTest ./strongswan-swanctl.nix;

     

       1321
       1321
        
         stub-ld = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stub-ld.nix { };

     

       1322
       1322
       -
         stunnel = handleTest ./stunnel.nix { };

     

       1322
       1322
       +
         stunnel = import ./stunnel.nix { inherit runTest; };

     

       1323
       1323
        
         sudo = runTest ./sudo.nix;

     

       1324
       1324
        
         sudo-rs = runTest ./sudo-rs.nix;

     

       1325
       1325
        
         sunshine = runTest ./sunshine.nix;

+13 -16

nixos/tests/stunnel.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         system ? builtins.currentSystem,

     

       3
       3
       -
         config ? { },

     

       4
       4
       -
         pkgs ? import ../.. { inherit system config; },

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       with import ../lib/testing-python.nix { inherit system pkgs; };

     

       8
       8
       -
       with pkgs.lib;

     

       1
       1
       +
       { runTest }:

     

       9
       2
        
       

     

       10
       3
        
       let

     

       11
       4
        
         stunnelCommon = {

     
···

       20
       13
        
           };

     

       21
       14
        
         };

     

       22
       15
        
         makeCert =

     

       23
       23
       -
           { config, pkgs, ... }:

     

       16
       16
       +
           {

     

       17
       17
       +
             config,

     

       18
       18
       +
             lib,

     

       19
       19
       +
             pkgs,

     

       20
       20
       +
             ...

     

       21
       21
       +
           }:

     

       24
       22
        
           {

     

       25
       23
        
             systemd.services.create-test-cert = {

     

       26
       24
        
               wantedBy = [ "sysinit.target" ];

     
···

       32
       30
        
               unitConfig.DefaultDependencies = false;

     

       33
       31
        
               serviceConfig.Type = "oneshot";

     

       34
       32
        
               script = ''

     

       35
       35
       -
                 ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName}

     

       33
       33
       +
                 ${lib.getExe pkgs.openssl} req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName}

     

       36
       34
        
                 ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem )

     

       37
       35
        
                 chown stunnel /test-key.pem /test-key-and-cert.pem

     

       38
       36
        
               '';

     

       39
       37
        
             };

     

       40
       38
        
           };

     

       41
       39
        
         serverCommon =

     

       42
       42
       -
           { pkgs, ... }:

     

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

     

       43
       41
        
           {

     

       44
       42
        
             networking.firewall.allowedTCPPorts = [ 443 ];

     

       45
       43
        
             services.stunnel.servers.https = {

     
···

       51
       49
        
               wantedBy = [ "multi-user.target" ];

     

       52
       50
        
               script = ''

     

       53
       51
        
                 cd /etc/webroot

     

       54
       54
       -
                 ${pkgs.python3}/bin/python -m http.server 80

     

       52
       52
       +
                 ${lib.getExe' pkgs.python3 "python"} -m http.server 80

     

       55
       53
        
               '';

     

       56
       54
        
             };

     

       57
       55
        
           };

     
···

       61
       59
        
           server_cert = ${src}.succeed("cat /test-cert.pem")

     

       62
       60
        
           ${dest}.succeed("echo %s > ${filename}" % quote(server_cert))

     

       63
       61
        
         '';

     

       64
       64
       -
       

     

       65
       62
        
       in

     

       66
       63
        
       {

     

       67
       67
       -
         basicServer = makeTest {

     

       64
       64
       +
         basicServer = runTest {

     

       68
       65
        
           name = "basicServer";

     

       69
       66
        
       

     

       70
       67
        
           nodes = {

     
···

       92
       89
        
           '';

     

       93
       90
        
         };

     

       94
       91
        
       

     

       95
       95
       -
         serverAndClient = makeTest {

     

       92
       92
       +
         serverAndClient = runTest {

     

       96
       93
        
           name = "serverAndClient";

     

       97
       94
        
       

     

       98
       95
        
           nodes = {

     
···

       150
       147
        
           '';

     

       151
       148
        
         };

     

       152
       149
        
       

     

       153
       153
       -
         mutualAuth = makeTest {

     

       150
       150
       +
         mutualAuth = runTest {

     

       154
       151
        
           name = "mutualAuth";

     

       155
       152
        
       

     

       156
       153
        
           nodes = rec {