Unverified Commit 3c853295 authored by r-vdp's avatar r-vdp
Browse files

nixos/wstunnel: convert to RFC42-style settings

parent 48adf72a

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

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 


- `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`



- The `wstunnel` module was converted to RFC42-style settings, you will need to update your NixOS config if you make use of this module.



## Other Notable Changes {#sec-release-25.11-notable-changes}



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/services/networking/wstunnel.nix

+276 −267

File changed.

Preview size limit exceeded, changes collapsed.

nixos/tests/wstunnel.nix

+11 −7
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ in 
            host = "10.0.0.1";

            port = 443;

          };

          tlsCertificate = certs.${domain}.cert;

          tlsKey = certs.${domain}.key;

          settings = {

            tls-certificate = "${certs.${domain}.cert}";

            tls-private-key = "${certs.${domain}.key}";

          };

        };

      };

    };
@@ -45,9 +47,9 @@ in 
        useNetworkd = true;

        useDHCP = false;

        firewall.enable = false;

        extraHosts = ''

          10.0.0.1 ${domain}

        '';

        hosts = {

          "10.0.0.1" = [ domain ];

        };

      };



      systemd.network.networks."01-eth1" = {
@@ -60,8 +62,10 @@ in 
        clients.my-client = {

          autoStart = false;

          connectTo = "wss://${domain}:443";

          localToRemote = [ "tcp://8080:localhost:2080" ];

          remoteToLocal = [ "tcp://2081:localhost:8081" ];

          settings = {

            local-to-remote = [ "tcp://8080:localhost:2080" ];

            remote-to-local = [ "tcp://2081:localhost:8081" ];

          };

        };

      };

    };