commit 17ca3dd2a6a448af47bb5f708ccc362893c4c6b1 · pyrox.dev/nixpkgs

+1 -1

nixos/doc/manual/release-notes/rl-2305.section.md

···

105
105

106
106

- The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2.

107
107

108
108
-
- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100).

108
108
+
- `teleport` has been upgraded from major version 10 to major version 12. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and release notes for versions [11](https://goteleport.com/docs/changelog/#1100) and [12](https://goteleport.com/docs/changelog/#1201). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 11.x version by setting `services.teleport.package = pkgs.teleport_11`. Afterwards, this option can be removed to upgrade to the default version (12).

109
109

110
110

- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.

111
111

+10 -2

nixos/modules/services/networking/teleport.nix

···

       11
       11
        
           services.teleport = with lib.types; {

     

       12
       12
        
             enable = mkEnableOption (lib.mdDoc "the Teleport service");

     

       13
       13
        
       

     

       14
       14
       +
             package = mkOption {

     

       15
       15
       +
               type = types.package;

     

       16
       16
       +
               default = pkgs.teleport;

     

       17
       17
       +
               defaultText = lib.literalMD "pkgs.teleport";

     

       18
       18
       +
               example = lib.literalMD "pkgs.teleport_11";

     

       19
       19
       +
               description = lib.mdDoc "The teleport package to use";

     

       20
       20
       +
             };

     

       21
       21
       +
       

     

       14
       22
        
             settings = mkOption {

     

       15
       23
        
               type = settingsYaml.type;

     

       16
       24
        
               default = { };

     
···

       74
       82
        
         };

     

       75
       83
        
       

     

       76
       84
        
         config = mkIf config.services.teleport.enable {

     

       77
       77
       -
           environment.systemPackages = [ pkgs.teleport ];

     

       85
       85
       +
           environment.systemPackages = [ cfg.package ];

     

       78
       86
        
       

     

       79
       87
        
           systemd.services.teleport = {

     

       80
       88
        
             wantedBy = [ "multi-user.target" ];

     

       81
       89
        
             after = [ "network.target" ];

     

       82
       90
        
             serviceConfig = {

     

       83
       91
        
               ExecStart = ''

     

       84
       84
       -
                 ${pkgs.teleport}/bin/teleport start \

     

       92
       92
       +
                 ${cfg.package}/bin/teleport start \

     

       85
       93
        
                   ${optionalString cfg.insecure.enable "--insecure"} \

     

       86
       94
        
                   ${optionalString cfg.diag.enable "--diag-addr=${cfg.diag.addr}:${toString cfg.diag.port}"} \

     

       87
       95
        
                   ${optionalString (cfg.settings != { }) "--config=${settingsYaml.generate "teleport.yaml" cfg.settings}"}

+49 -33

nixos/tests/teleport.nix

···

       1
       1
        
       { system ? builtins.currentSystem

     

       2
       2
        
       , config ? { }

     

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

     

       4
       4
       +
       , lib ? pkgs.lib

     

       4
       5
        
       }:

     

       5
       6
        
       

     

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

     

       7
       8
        
       

     

       8
       9
        
       let

     

       9
       9
       -
         minimal = { config, ... }: {

     

       10
       10
       -
           services.teleport.enable = true;

     

       10
       10
       +
         packages = with pkgs; {

     

       11
       11
       +
           "default" = teleport;

     

       12
       12
       +
           "11" = teleport_11;

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         minimal = package: {

     

       16
       16
       +
           services.teleport = {

     

       17
       17
       +
             enable = true;

     

       18
       18
       +
             inherit package;

     

       19
       19
       +
           };

     

       11
       20
        
         };

     

       12
       21
        
       

     

       13
       13
       -
         client = { config, ... }: {

     

       22
       22
       +
         client = package: {

     

       14
       23
        
           services.teleport = {

     

       15
       24
        
             enable = true;

     

       25
       25
       +
             inherit package;

     

       16
       26
        
             settings = {

     

       17
       27
        
               teleport = {

     

       18
       28
        
                 nodename = "client";

     
···

       37
       47
        
           }];

     

       38
       48
        
         };

     

       39
       49
        
       

     

       40
       40
       -
         server = { config, ... }: {

     

       50
       50
       +
         server = package: {

     

       41
       51
        
           services.teleport = {

     

       42
       52
        
             enable = true;

     

       53
       53
       +
             inherit package;

     

       43
       54
        
             settings = {

     

       44
       55
        
               teleport = {

     

       45
       56
        
                 nodename = "server";

     
···

       64
       75
        
           };

     

       65
       76
        
         };

     

       66
       77
        
       in

     

       67
       67
       -
       {

     

       68
       68
       -
         minimal = makeTest {

     

       69
       69
       -
           # minimal setup should always work

     

       70
       70
       -
           name = "teleport-minimal-setup";

     

       71
       71
       -
           meta.maintainers = with pkgs.lib.maintainers; [ ymatsiuk ];

     

       72
       72
       -
           nodes = { inherit minimal; };

     

       78
       78
       +
       lib.concatMapAttrs

     

       79
       79
       +
         (name: package: {

     

       80
       80
       +
           "minimal_${name}" = makeTest {

     

       81
       81
       +
             # minimal setup should always work

     

       82
       82
       +
             name = "teleport-minimal-setup";

     

       83
       83
       +
             meta.maintainers = with pkgs.lib.maintainers; [ justinas ];

     

       84
       84
       +
             nodes.minimal = minimal package;

     

       73
       85
        
       

     

       74
       74
       -
           testScript = ''

     

       75
       75
       -
             minimal.wait_for_open_port(3025)

     

       76
       76
       -
             minimal.wait_for_open_port(3080)

     

       77
       77
       -
             minimal.wait_for_open_port(3022)

     

       78
       78
       -
           '';

     

       79
       79
       -
         };

     

       86
       86
       +
             testScript = ''

     

       87
       87
       +
               minimal.wait_for_open_port(3025)

     

       88
       88
       +
               minimal.wait_for_open_port(3080)

     

       89
       89
       +
               minimal.wait_for_open_port(3022)

     

       90
       90
       +
             '';

     

       91
       91
       +
           };

     

       80
       92
        
       

     

       81
       81
       -
         basic = makeTest {

     

       82
       82
       -
           # basic server and client test

     

       83
       83
       -
           name = "teleport-server-client";

     

       84
       84
       -
           meta.maintainers = with pkgs.lib.maintainers; [ ymatsiuk ];

     

       85
       85
       -
           nodes = { inherit server client; };

     

       93
       93
       +
           "basic_${name}" = makeTest {

     

       94
       94
       +
             # basic server and client test

     

       95
       95
       +
             name = "teleport-server-client";

     

       96
       96
       +
             meta.maintainers = with pkgs.lib.maintainers; [ justinas ];

     

       97
       97
       +
             nodes = {

     

       98
       98
       +
               server = server package;

     

       99
       99
       +
               client = client package;

     

       100
       100
       +
             };

     

       86
       101
        
       

     

       87
       87
       -
           testScript = ''

     

       88
       88
       -
             with subtest("teleport ready"):

     

       89
       89
       -
                 server.wait_for_open_port(3025)

     

       90
       90
       -
                 client.wait_for_open_port(3022)

     

       102
       102
       +
             testScript = ''

     

       103
       103
       +
               with subtest("teleport ready"):

     

       104
       104
       +
                   server.wait_for_open_port(3025)

     

       105
       105
       +
                   client.wait_for_open_port(3022)

     

       91
       106
        
       

     

       92
       92
       -
             with subtest("check applied configuration"):

     

       93
       93
       -
                 server.wait_until_succeeds("tctl get nodes --format=json | ${pkgs.jq}/bin/jq -e '.[] | select(.spec.hostname==\"client\") | .metadata.labels.role==\"client\"'")

     

       94
       94
       -
                 server.wait_for_open_port(3000)

     

       95
       95
       -
                 client.succeed("journalctl -u teleport.service --grep='DEBU'")

     

       96
       96
       -
                 server.succeed("journalctl -u teleport.service --grep='Starting teleport in insecure mode.'")

     

       97
       97
       -
           '';

     

       98
       98
       -
         };

     

       99
       99
       -
       }

     

       107
       107
       +
               with subtest("check applied configuration"):

     

       108
       108
       +
                   server.wait_until_succeeds("tctl get nodes --format=json | ${pkgs.jq}/bin/jq -e '.[] | select(.spec.hostname==\"client\") | .metadata.labels.role==\"client\"'")

     

       109
       109
       +
                   server.wait_for_open_port(3000)

     

       110
       110
       +
                   client.succeed("journalctl -u teleport.service --grep='DEBU'")

     

       111
       111
       +
                   server.succeed("journalctl -u teleport.service --grep='Starting teleport in insecure mode.'")

     

       112
       112
       +
             '';

     

       113
       113
       +
           };

     

       114
       114
       +
         })

     

       115
       115
       +
         packages

+8

pkgs/servers/teleport/11.nix

···

       1
       1
       +
       { callPackage, ... }@args:

     

       2
       2
       +
       callPackage ./generic.nix ({

     

       3
       3
       +
         version = "11.3.5";

     

       4
       4
       +
         hash = "sha256-/InWly0jCiPBlgM/qgS6ErMv7Hhg5PW9sldda1oaUIg=";

     

       5
       5
       +
         vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA=";

     

       6
       6
       +
         cargoHash = "sha256-02qo6i6GuRAYKDKA7k2hDq2O6ayEQbeGhFS2g3b9Wuo=";

     

       7
       7
       +
         yarnHash = "sha256-kvnVmDZ/jISaaS97KM0WbPJU7Y8XWOeHrDLT0iXRyfc=";

     

       8
       8
       +
       } // builtins.removeAttrs args [ "callPackage" ])

+8

pkgs/servers/teleport/12.nix

···

       1
       1
       +
       { callPackage, ... }@args:

     

       2
       2
       +
       callPackage ./generic.nix ({

     

       3
       3
       +
         version = "12.0.2";

     

       4
       4
       +
         hash = "sha256-9RD4ETQEXnj3d5YID3f3BghwitdqfcDgNhsk8ixWTW4=";

     

       5
       5
       +
         vendorHash = "sha256-2sOELuMyg7w/rhnWvnwDiUOsjUfb56JdAbrTGKvGnjs=";

     

       6
       6
       +
         cargoHash = "sha256-1ScU5ywq8vz1sWHW2idBsWcB1Xs+aylukBm96dKrwL4=";

     

       7
       7
       +
         yarnHash = "sha256-ItRi5EkYrwNB1MIf9l3yyK1BX6vNpL2+H1BlN3Evibg=";

     

       8
       8
       +
       } // builtins.removeAttrs args [ "callPackage" ])

+11 -5

pkgs/servers/teleport/default.nix pkgs/servers/teleport/generic.nix

···

       20
       20
        
       , nixosTests

     

       21
       21
        
       

     

       22
       22
        
       , withRdpClient ? true

     

       23
       23
       +
       

     

       24
       24
       +
       , version

     

       25
       25
       +
       , hash

     

       26
       26
       +
       , vendorHash

     

       27
       27
       +
       , cargoHash

     

       28
       28
       +
       , yarnHash

     

       23
       29
        
       }:

     

       24
       30
        
       let

     

       25
       31
        
         # This repo has a private submodule "e" which fetchgit cannot handle without failing.

     
···

       27
       33
        
           owner = "gravitational";

     

       28
       34
        
           repo = "teleport";

     

       29
       35
        
           rev = "v${version}";

     

       30
       30
       -
           hash = "sha256-jJfOgcwKkNFO/5XHxMoapZxM8Tb0kEgKVA7SrMU7uW4=";

     

       36
       36
       +
           inherit hash;

     

       31
       37
        
         };

     

       32
       32
       -
         version = "11.3.4";

     

       38
       38
       +
         inherit version;

     

       33
       39
        
       

     

       34
       40
        
         rdpClient = rustPlatform.buildRustPackage rec {

     

       35
       41
        
           pname = "teleport-rdpclient";

     

       36
       36
       -
           cargoHash = "sha256-TSIwLCY01ygCWT73LR/Ch7NwPQA3a3r0PyL3hUzBNr4=";

     

       42
       42
       +
           inherit cargoHash;

     

       37
       43
        
           inherit version src;

     

       38
       44
        
       

     

       39
       45
        
           buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";

     
···

       56
       62
        
       

     

       57
       63
        
         yarnOfflineCache = fetchYarnDeps {

     

       58
       64
        
           yarnLock = "${src}/yarn.lock";

     

       59
       59
       -
           hash = "sha256-MAGeWzA366yzpjdCY0+X6RV5MKcsHa/xD5CJu6ce1FU=";

     

       65
       65
       +
           hash = yarnHash;

     

       60
       66
        
         };

     

       61
       67
        
       

     

       62
       68
        
         webassets = stdenv.mkDerivation {

     
···

       95
       101
        
         pname = "teleport";

     

       96
       102
        
       

     

       97
       103
        
         inherit src version;

     

       98
       98
       -
         vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA=";

     

       104
       104
       +
         inherit vendorHash;

     

       99
       105
        
         proxyVendor = true;

     

       100
       106
        
       

     

       101
       107
        
         subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ];

+5 -1

pkgs/top-level/all-packages.nix

···

       12570
       12570
        
       

     

       12571
       12571
        
         telegraf = callPackage ../servers/monitoring/telegraf { };

     

       12572
       12572
        
       

     

       12573
       12573
       -
         teleport = callPackage ../servers/teleport {

     

       12573
       12573
       +
         teleport_11 = callPackage ../servers/teleport/11.nix {

     

       12574
       12574
        
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;

     

       12575
       12575
        
         };

     

       12576
       12576
       +
         teleport_12 = callPackage ../servers/teleport/12.nix {

     

       12577
       12577
       +
           inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;

     

       12578
       12578
       +
         };

     

       12579
       12579
       +
         teleport = teleport_12;

     

       12576
       12580
        
       

     

       12577
       12581
        
         telepresence = callPackage ../tools/networking/telepresence {

     

       12578
       12582
        
           pythonPackages = python3Packages;