summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorpennae <82953136+pennae@users.noreply.github.com>2022-01-31 23:53:18 +0000
committerGitHub <noreply@github.com>2022-01-31 23:53:18 +0000
commit7325eb455b724ae2258b616bdd0e6072ae77442e (patch)
treec5534953c98b030e4e4928cb8d179484638ad3d4 /nixos/doc
parent4e6c49b81bc1b0b89830e7e597ccd882b0319dea (diff)
parent00db4205fbb2b32b67125b2f35c738c47b64322a (diff)
downloadnixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.tar
nixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.tar.gz
nixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.tar.bz2
nixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.tar.lz
nixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.tar.xz
nixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.tar.zst
nixpkgs-7325eb455b724ae2258b616bdd0e6072ae77442e.zip
Merge pull request #157046 from kradalby/add-headscale-module
Add headscale module
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2205.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2205.section.md2
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 2d2eec1763c..8c4bc735519 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -192,6 +192,15 @@
           <link xlink:href="options.html#opt-services.rstudio-server.enable">services.rstudio-server</link>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <link xlink:href="https://github.com/juanfont/headscale">headscale</link>,
+          an Open Source implementation of the
+          <link xlink:href="https://tailscale.io">Tailscale</link>
+          Control Server. Available as
+          <link xlink:href="options.html#opt-services.headscale.enable">services.headscale</link>
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-22.05-incompatibilities">
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 448f302afe6..cfff3afd81c 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -58,6 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).
 
+- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable)
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Backward Incompatibilities {#sec-release-22.05-incompatibilities}