diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2023-10-29 23:19:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 23:19:38 +0100 |
| commit | 800965ce8c3d8d7abb91267886f6b43e37f2bf18 (patch) | |
| tree | 19db3f93e138c549cd63641fab41c72e4f067a5c /nixos/tests | |
| parent | cfb3988290cc0e5ea39abd55ecb39c824609b380 (diff) | |
| parent | fc4691cd06adeb4bebb00fa7137e135055a5e491 (diff) | |
| download | nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.tar nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.tar.gz nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.tar.bz2 nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.tar.lz nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.tar.xz nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.tar.zst nixpkgs-800965ce8c3d8d7abb91267886f6b43e37f2bf18.zip | |
Merge pull request #245855 from rnhmjoj/pr-sslh
nixos/sslh: update and refactor for RFC42
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/sslh.nix | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/nixos/tests/sslh.nix b/nixos/tests/sslh.nix index 17094606e8e..30ffd389d44 100644 --- a/nixos/tests/sslh.nix +++ b/nixos/tests/sslh.nix @@ -10,21 +10,13 @@ import ./make-test-python.nix { prefixLength = 64; } ]; - # sslh is really slow when reverse dns does not work - networking.hosts = { - "fe00:aa:bb:cc::2" = [ "server" ]; - "fe00:aa:bb:cc::1" = [ "client" ]; - }; services.sslh = { enable = true; - transparent = true; - appendConfig = '' - protocols: - ( - { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, - { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - ); - ''; + settings.transparent = true; + settings.protocols = [ + { name = "ssh"; service = "ssh"; host = "localhost"; port = "22"; probe = "builtin"; } + { name = "http"; host = "localhost"; port = "80"; probe = "builtin"; } + ]; }; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ]; |