diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-09 18:02:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 18:02:10 +0000 |
| commit | 3b377950672778e80c1ff08fadee931ddd789cd9 (patch) | |
| tree | 2a40fb71ece1dad82605b18ff52789482e90417d /nixos/doc | |
| parent | 3e675d06f5f236e84a90ccd4d993d1784d043b4f (diff) | |
| parent | 44f6a02f39c656d41f2e1f682902490103399b03 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a09a567b51aec..3e034f1833c45 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -279,6 +279,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/shizunge/endlessh-go">endlessh-go</link>, + an SSH tarpit that exposes Prometheus metrics. Available as + <link linkend="opt-services.endlessh-go.enable">services.endlessh-go</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://netbird.io">netbird</link>, a zero configuration VPN. Available as <link xlink:href="options.html#opt-services.netbird.enable">services.netbird</link>. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 94840012e58b1..a80ff4797fbca 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -97,6 +97,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). +- [endlessh-go](https://github.com/shizunge/endlessh-go), an SSH tarpit that exposes Prometheus metrics. Available as [services.endlessh-go](#opt-services.endlessh-go.enable). + - [netbird](https://netbird.io), a zero configuration VPN. Available as [services.netbird](options.html#opt-services.netbird.enable). |