diff options
| author | symphorien <symphorien@users.noreply.github.com> | 2020-10-21 19:34:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-21 21:34:35 +0200 |
| commit | 9e8eaea484a2a6b4847dd2e35e5b764d4086a440 (patch) | |
| tree | 49a88ba5fde1678dcdace1a88331c828e94affc1 | |
| parent | 278d8641c8da8cea2fa506e7a887d887ba38b14c (diff) | |
| download | nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.tar nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.tar.gz nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.tar.bz2 nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.tar.lz nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.tar.xz nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.tar.zst nixlib-9e8eaea484a2a6b4847dd2e35e5b764d4086a440.zip | |
nixos/sslh: fix usage of the now removed ssl probe (#101087)
and document
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2009.xml | 7 | ||||
| -rw-r--r-- | nixos/modules/services/networking/sslh.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 04086275d7c6..782227de06f4 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -643,6 +643,13 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; In the <literal>resilio</literal> module, <xref linkend="opt-services.resilio.httpListenAddr"/> has been changed to listen to <literal>[::1]</literal> instead of <literal>0.0.0.0</literal>. </para> </listitem> + <listitem> + <para> + <literal>sslh</literal> has been updated to version + <literal>1.21</literal>. The <literal>ssl</literal> probe must be + renamed to <literal>tls</literal> in <xref linkend="opt-services.sslh.appendConfig"/>. + </para> + </listitem> <listitem> <para> Users of <link xlink:href="http://openafs.org">OpenAFS 1.6</link> must diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index 0921febba668..4c2740d20192 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -31,7 +31,7 @@ let { name: "openvpn"; host: "localhost"; port: "1194"; probe: "builtin"; }, { name: "xmpp"; host: "localhost"; port: "5222"; probe: "builtin"; }, { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, - { name: "ssl"; host: "localhost"; port: "443"; probe: "builtin"; }, + { name: "tls"; host: "localhost"; port: "443"; probe: "builtin"; }, { name: "anyprot"; host: "localhost"; port: "443"; probe: "builtin"; } ); ''; |