From 0003e30084f0c69469032652dd8ed0fae24a43ac Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 2 Apr 2022 11:45:18 +0200 Subject: [PATCH 1/8] Suggest English as lingua franca --- .github/ISSUE_TEMPLATE/bug_report.md | 2 ++ .github/ISSUE_TEMPLATE/feature_request.md | 2 ++ .github/ISSUE_TEMPLATE/other_issue.md | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f0902132..d989a84c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,6 +6,8 @@ labels: ["bug"] assignees: "" --- + + **Bug description** + **Feature request** diff --git a/.github/ISSUE_TEMPLATE/other_issue.md b/.github/ISSUE_TEMPLATE/other_issue.md index 76811e67..3004a97c 100644 --- a/.github/ISSUE_TEMPLATE/other_issue.md +++ b/.github/ISSUE_TEMPLATE/other_issue.md @@ -6,6 +6,8 @@ labels: ["bug"] assignees: "" --- + + **Issue description** From be2487f4c00adc153afd8cf7a8e1a9cb2ade354a Mon Sep 17 00:00:00 2001 From: Moritz Poldrack <33086936+mpldr@users.noreply.github.com> Date: Sat, 16 Apr 2022 23:52:06 +0200 Subject: [PATCH 2/8] Clarified systemd friendly path Suggested-by: Rendezvous --- docs/running-headscale-linux.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/running-headscale-linux.md b/docs/running-headscale-linux.md index 98a67f1d..166851b0 100644 --- a/docs/running-headscale-linux.md +++ b/docs/running-headscale-linux.md @@ -150,7 +150,7 @@ or run all headscale commands as the headscale user: su - headscale ``` -2. In `/etc/headscale/config.yaml`, override the default `headscale` unix socket with a SystemD friendly path: +2. In `/etc/headscale/config.yaml`, override the default `headscale` unix socket with path that is writable by the `headscale` user or group: ```yaml unix_socket: /var/run/headscale/headscale.sock @@ -165,8 +165,7 @@ systemctl daemon-reload 4. Enable and start the new `headscale` service: ```shell -systemctl enable headscale -systemctl start headscale +systemctl enable --now headscale ``` 5. Verify the headscale service: From 41a8c14acb9657f10238da74c9177642cad1b286 Mon Sep 17 00:00:00 2001 From: Moritz Poldrack <33086936+mpldr@users.noreply.github.com> Date: Sat, 16 Apr 2022 23:56:57 +0200 Subject: [PATCH 3/8] add information on how to create a headscale user --- docs/running-headscale-linux.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/running-headscale-linux.md b/docs/running-headscale-linux.md index 166851b0..55b002f6 100644 --- a/docs/running-headscale-linux.md +++ b/docs/running-headscale-linux.md @@ -30,6 +30,8 @@ mkdir -p /etc/headscale # Directory for Database, and other variable data (like certificates) mkdir -p /var/lib/headscale +# or if you create a headscale user: +useradd -md /var/lib/headscale/ -rUs /usr/bin/nologin headscale ``` 4. Create an empty SQLite database: From 7ce0bd053c2ceebbdac931d2a01799dfba65a8a7 Mon Sep 17 00:00:00 2001 From: Moritz Poldrack <33086936+mpldr@users.noreply.github.com> Date: Sat, 16 Apr 2022 23:58:05 +0200 Subject: [PATCH 4/8] removed leading whitespace --- docs/running-headscale-linux.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/running-headscale-linux.md b/docs/running-headscale-linux.md index 55b002f6..e3e96990 100644 --- a/docs/running-headscale-linux.md +++ b/docs/running-headscale-linux.md @@ -52,7 +52,7 @@ from the [headscale repository](../) 6. Start the headscale server: ```shell - headscale serve +headscale serve ``` This command will start `headscale` in the current terminal session. From 9254afff2ddb48b6e60688ddad83abd6441893ec Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 21 Apr 2022 09:06:13 +0100 Subject: [PATCH 5/8] Add direnv and nix output to gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index d047cbfd..5556580d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ derp.yaml .idea test_output/ + +# Nix and direnv +.direnv/ +result From 580c72bf167f48fad9b534ad50c3247334480eff Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 21 Apr 2022 09:06:30 +0100 Subject: [PATCH 6/8] Update discord link so it does not grant temp memberships --- README.md | 2 +- docs/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f712416..8631eb92 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ An open source, self-hosted implementation of the Tailscale control server. -Join our [Discord](https://discord.gg/xGj2TuqyxY) server for a chat. +Join our [Discord](https://discord.gg/c84AZQhmpx) server for a chat. **Note:** Always select the same GitHub tag as the released version you use to ensure you have the correct example configuration and documentation. diff --git a/docs/README.md b/docs/README.md index 7a3080e3..459a6c21 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,7 +3,7 @@ This page contains the official and community contributed documentation for `headscale`. If you are having trouble with following the documentation or get unexpected results, -please ask on [Discord](https://discord.gg/XcQxk2VHjx) instead of opening an Issue. +please ask on [Discord](https://discord.gg/c84AZQhmpx) instead of opening an Issue. ## Official documentation From 6dd9e93346b2d8a55540c855ea8ce976a51fceef Mon Sep 17 00:00:00 2001 From: Moritz Poldrack Date: Thu, 21 Apr 2022 11:00:17 +0200 Subject: [PATCH 7/8] expanded arguments in useradd to be easier to understand for beginners --- docs/running-headscale-linux.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/running-headscale-linux.md b/docs/running-headscale-linux.md index e3e96990..89d02e87 100644 --- a/docs/running-headscale-linux.md +++ b/docs/running-headscale-linux.md @@ -31,7 +31,13 @@ mkdir -p /etc/headscale # Directory for Database, and other variable data (like certificates) mkdir -p /var/lib/headscale # or if you create a headscale user: -useradd -md /var/lib/headscale/ -rUs /usr/bin/nologin headscale +useradd \ + --create-home \ + --home-dir /var/lib/headscale/ \ + --system \ + --user-group \ + --shell /usr/bin/nologin \ + headscale ``` 4. Create an empty SQLite database: From c8ed1f0f432b77786b4f167699c60e450209fe06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Apr 2022 11:51:30 +0000 Subject: [PATCH 8/8] docs(README): update contributors --- README.md | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 8631eb92..b64482d1 100644 --- a/README.md +++ b/README.md @@ -206,6 +206,13 @@ make build Alessandro (Ale) Segala + + + Nico/ +
+ Nico + + unreality/ @@ -214,10 +221,10 @@ make build - - Nico/ + + Moritz
- Nico + Moritz Poldrack @@ -227,6 +234,8 @@ make build Niek van der Maas + + Eugen @@ -234,8 +243,6 @@ make build Eugen Biegler - - Aaron @@ -271,6 +278,8 @@ make build Michael G. + + Paul @@ -278,8 +287,6 @@ make build Paul Tötterman - - Artem @@ -315,6 +322,8 @@ make build lachy2849 + + thomas/ @@ -322,8 +331,6 @@ make build thomas - - Abraham @@ -359,6 +366,8 @@ make build Carson Yang + + Felix @@ -366,8 +375,6 @@ make build Felix Kronlage-Dammers - - Felix @@ -403,6 +410,8 @@ make build Pierre Carru + + rcursaru/ @@ -410,8 +419,6 @@ make build rcursaru - - WhiteSource @@ -447,6 +454,8 @@ make build Teteros + + The @@ -454,8 +463,6 @@ make build The Gitter Badger - - Tianon @@ -491,6 +498,8 @@ make build ZiYuan + + bravechamp/ @@ -498,8 +507,6 @@ make build bravechamp - - derelm/ @@ -535,6 +542,8 @@ make build pernila + + Wakeful-Cloud/ @@ -542,8 +551,6 @@ make build Wakeful-Cloud - - zy/