commit c4bd20a68602c22ef8a872c7c14ad69c13d4f503 · pyrox.dev/nixpkgs

+1 -2

nixos/tests/wireguard/basic.nix

···

       1
       1
       -
       { kernelPackages ? null }:

     

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

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ...} :

     

       3
       2
        
         let

     

       4
       3
        
           wg-snakeoil-keys = import ./snakeoil-keys.nix;

     

       5
       4
        
           peer = (import ./make-peer.nix) { inherit lib; };

+2 -1

nixos/tests/wireguard/default.nix

···

       7
       7
        
       with pkgs.lib;

     

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
       -
         tests = let callTest = p: flip (import p) { inherit system pkgs; }; in {

     

       10
       10
       +
         tests = let callTest = p: args: import p ({ inherit system pkgs; } // args); in {

     

       11
       11
        
           basic = callTest ./basic.nix;

     

       12
       12
        
           namespaces = callTest ./namespaces.nix;

     

       13
       13
        
           wg-quick = callTest ./wg-quick.nix;

     

       14
       14
       +
           wg-quick-nftables = args: callTest ./wg-quick.nix ({ nftables = true; } // args);

     

       14
       15
        
           generated = callTest ./generated.nix;

     

       15
       16
        
         };

     

       16
       17
        
       in

+1 -2

nixos/tests/wireguard/generated.nix

···

       1
       1
       -
       { kernelPackages ? null }:

     

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

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : {

     

       3
       2
        
         name = "wireguard-generated";

     

       4
       3
        
         meta = with pkgs.lib.maintainers; {

     

       5
       4
        
           maintainers = [ ma27 grahamc ];

+1 -3

nixos/tests/wireguard/namespaces.nix

···

       1
       1
       -
       { kernelPackages ? null }:

     

       2
       2
       -
       

     

       3
       1
        
       let

     

       4
       2
        
         listenPort = 12345;

     

       5
       3
        
         socketNamespace = "foo";

     
···

       15
       13
        
       

     

       16
       14
        
       in

     

       17
       15
        
       

     

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

     

       16
       16
       +
       import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, ... } : {

     

       19
       17
        
         name = "wireguard-with-namespaces";

     

       20
       18
        
         meta = with pkgs.lib.maintainers; {

     

       21
       19
        
           maintainers = [ asymmetric ];

+41 -33

nixos/tests/wireguard/wg-quick.nix

···

       1
       1
       -
       { kernelPackages ? null }:

     

       2
       2
       -
       

     

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

     

       1
       1
       +
       import ../make-test-python.nix ({ pkgs, lib, kernelPackages ? null, nftables ? false, ... }:

     

       4
       2
        
         let

     

       5
       3
        
           wg-snakeoil-keys = import ./snakeoil-keys.nix;

     

       6
       6
       -
           peer = (import ./make-peer.nix) { inherit lib; };

     

       4
       4
       +
           peer = import ./make-peer.nix { inherit lib; };

     

       5
       5
       +
           commonConfig = {

     

       6
       6
       +
             boot.kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages;

     

       7
       7
       +
             networking.nftables.enable = nftables;

     

       8
       8
       +
             # Make sure iptables doesn't work with nftables enabled

     

       9
       9
       +
             boot.blacklistedKernelModules = lib.mkIf nftables [ "nft_compat" ];

     

       10
       10
       +
           };

     

       7
       11
        
         in

     

       8
       12
        
         {

     

       9
       13
        
           name = "wg-quick";

     
···

       15
       19
        
             peer0 = peer {

     

       16
       20
        
               ip4 = "192.168.0.1";

     

       17
       21
        
               ip6 = "fd00::1";

     

       18
       18
       -
               extraConfig = {

     

       19
       19
       -
                 boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       20
       20
       -
                 networking.firewall.allowedUDPPorts = [ 23542 ];

     

       21
       21
       -
                 networking.wg-quick.interfaces.wg0 = {

     

       22
       22
       -
                   address = [ "10.23.42.1/32" "fc00::1/128" ];

     

       23
       23
       -
                   listenPort = 23542;

     

       22
       22
       +
               extraConfig = lib.mkMerge [

     

       23
       23
       +
                 commonConfig

     

       24
       24
       +
                 {

     

       25
       25
       +
                   networking.firewall.allowedUDPPorts = [ 23542 ];

     

       26
       26
       +
                   networking.wg-quick.interfaces.wg0 = {

     

       27
       27
       +
                     address = [ "10.23.42.1/32" "fc00::1/128" ];

     

       28
       28
       +
                     listenPort = 23542;

     

       24
       29
        
       

     

       25
       25
       -
                   inherit (wg-snakeoil-keys.peer0) privateKey;

     

       30
       30
       +
                     inherit (wg-snakeoil-keys.peer0) privateKey;

     

       26
       31
        
       

     

       27
       27
       -
                   peers = lib.singleton {

     

       28
       28
       -
                     allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];

     

       32
       32
       +
                     peers = lib.singleton {

     

       33
       33
       +
                       allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];

     

       29
       34
        
       

     

       30
       30
       -
                     inherit (wg-snakeoil-keys.peer1) publicKey;

     

       31
       31
       -
                   };

     

       35
       35
       +
                       inherit (wg-snakeoil-keys.peer1) publicKey;

     

       36
       36
       +
                     };

     

       32
       37
        
       

     

       33
       33
       -
                   dns = [ "10.23.42.2" "fc00::2" "wg0" ];

     

       34
       34
       -
                 };

     

       35
       35
       -
               };

     

       38
       38
       +
                     dns = [ "10.23.42.2" "fc00::2" "wg0" ];

     

       39
       39
       +
                   };

     

       40
       40
       +
                 }

     

       41
       41
       +
               ];

     

       36
       42
        
             };

     

       37
       43
        
       

     

       38
       44
        
             peer1 = peer {

     

       39
       45
        
               ip4 = "192.168.0.2";

     

       40
       46
        
               ip6 = "fd00::2";

     

       41
       41
       -
               extraConfig = {

     

       42
       42
       -
                 boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; };

     

       43
       43
       -
                 networking.useNetworkd = true;

     

       44
       44
       -
                 networking.wg-quick.interfaces.wg0 = {

     

       45
       45
       -
                   address = [ "10.23.42.2/32" "fc00::2/128" ];

     

       46
       46
       -
                   inherit (wg-snakeoil-keys.peer1) privateKey;

     

       47
       47
       +
               extraConfig = lib.mkMerge [

     

       48
       48
       +
                 commonConfig

     

       49
       49
       +
                 {

     

       50
       50
       +
                   networking.useNetworkd = true;

     

       51
       51
       +
                   networking.wg-quick.interfaces.wg0 = {

     

       52
       52
       +
                     address = [ "10.23.42.2/32" "fc00::2/128" ];

     

       53
       53
       +
                     inherit (wg-snakeoil-keys.peer1) privateKey;

     

       54
       54
       +
       

     

       55
       55
       +
                     peers = lib.singleton {

     

       56
       56
       +
                       allowedIPs = [ "0.0.0.0/0" "::/0" ];

     

       57
       57
       +
                       endpoint = "192.168.0.1:23542";

     

       58
       58
       +
                       persistentKeepalive = 25;

     

       47
       59
        
       

     

       48
       48
       -
                   peers = lib.singleton {

     

       49
       49
       -
                     allowedIPs = [ "0.0.0.0/0" "::/0" ];

     

       50
       50
       -
                     endpoint = "192.168.0.1:23542";

     

       51
       51
       -
                     persistentKeepalive = 25;

     

       60
       60
       +
                       inherit (wg-snakeoil-keys.peer0) publicKey;

     

       61
       61
       +
                     };

     

       52
       62
        
       

     

       53
       53
       -
                     inherit (wg-snakeoil-keys.peer0) publicKey;

     

       63
       63
       +
                     dns = [ "10.23.42.1" "fc00::1" "wg0" ];

     

       54
       64
        
                   };

     

       55
       55
       -
       

     

       56
       56
       -
                   dns = [ "10.23.42.1" "fc00::1" "wg0" ];

     

       57
       57
       -
                 };

     

       58
       58
       -
               };

     

       65
       65
       +
                 }

     

       66
       66
       +
               ];

     

       59
       67
        
             };

     

       60
       68
        
           };

     

       61
       69