Skip to content

Commit cb0e2e4

Browse files
various doc updates in prep for 0.23 (#2091)
* various doc updates in prep for 0.23 Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * add note discouraging postgresql Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * Update docs/faq.md Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * remove entry for glossary in doc Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> * fix typo Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> --------- Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent 2b5e52b commit cb0e2e4

6 files changed

Lines changed: 13 additions & 44 deletions

File tree

config-example.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ disable_check_updates: false
138138
ephemeral_node_inactivity_timeout: 30m
139139

140140
database:
141+
# Database type. Available options: sqlite, postgres
142+
# Please not that using Postgres is highly discouraged as it is only supported for legacy reasons.
143+
# All new development, testing and optimisations are done with SQLite in mind.
141144
type: sqlite
142145

143146
# Enable debug mode. This setting requires the log.level to be set to "debug" or "trace".
@@ -166,6 +169,8 @@ database:
166169
write_ahead_log: true
167170

168171
# # Postgres config
172+
# Please note that using Postgres is highly discouraged as it is only supported for legacy reasons.
173+
# See database.type for more information.
169174
# postgres:
170175
# # If using a Unix socket to connect to Postgres, set the socket path in the 'host' field and leave 'port' blank.
171176
# host: localhost

docs/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ We are more than happy to exchange emails, or to have dedicated calls before a P
3131

3232
## When/Why is Feature X going to be implemented?
3333

34-
We don't know. We might be working on it. If you want to help, please send us a PR.
34+
We don't know. We might be working on it. If you're interested in contributing, please post a feature request about it.
3535

3636
Please be aware that there are a number of reasons why we might not accept specific contributions:
3737

docs/glossary.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

docs/index.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ buttons available in the repo.
3131
Headscale is "Open Source, acknowledged contribution", this means that any
3232
contribution will have to be discussed with the Maintainers before being submitted.
3333

34-
This model has been chosen to reduce the risk of burnout by limiting the
35-
maintenance overhead of reviewing and validating third-party code.
36-
37-
Headscale is open to code contributions for bug fixes without discussion.
38-
39-
If you find mistakes in the documentation, please submit a fix to the documentation.
34+
Please see [CONTRIBUTING.md](https://github.com/juanfont/headscale/blob/main/CONTRIBUTING.md) for more information.
4035

4136
## About
4237

docs/running-headscale-container.md

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,36 +42,12 @@ not work with alternatives like [Podman](https://podman.io). The Docker image ca
4242
curl https://raw.githubusercontent.com/juanfont/headscale/main/config-example.yaml -o ./config/config.yaml
4343
```
4444

45-
- **(Advanced)** If you would like to hand craft a config file **instead** of downloading the example config file, create a blank `headscale` configuration in the headscale directory to edit:
45+
Modify the config file to your preferences before launching Docker container.
46+
Here are some settings that you likely want:
4647

47-
```shell
48-
touch ./config/config.yaml
49-
```
50-
51-
Modify the config file to your preferences before launching Docker container.
52-
Here are some settings that you likely want:
53-
54-
```yaml
55-
# Change to your hostname or host IP
56-
server_url: http://your-host-name:8080
57-
# Listen to 0.0.0.0 so it's accessible outside the container
58-
metrics_listen_addr: 0.0.0.0:9090
59-
# The default /var/lib/headscale path is not writable in the container
60-
noise:
61-
private_key_path: /etc/headscale/noise_private.key
62-
# The default /var/lib/headscale path is not writable in the container
63-
derp:
64-
private_key_path: /etc/headscale/private.key
65-
# The default /var/run/headscale path is not writable in the container
66-
unix_socket: /etc/headscale/headscale.sock
67-
# The default /var/lib/headscale path is not writable in the container
68-
database.type: sqlite3
69-
database.sqlite.path: /etc/headscale/db.sqlite
70-
```
71-
72-
Alternatively, you can mount `/var/lib` and `/var/run` from your host system by adding
73-
`--volume $(pwd)/lib:/var/lib/headscale` and `--volume $(pwd)/run:/var/run/headscale`
74-
in the next step.
48+
Alternatively, you can mount `/var/lib` and `/var/run` from your host system by adding
49+
`--volume $(pwd)/lib:/var/lib/headscale` and `--volume $(pwd)/run:/var/run/headscale`
50+
in the next step.
7551

7652
1. Start the headscale server while working in the host headscale directory:
7753

@@ -95,7 +71,7 @@ not work with alternatives like [Podman](https://podman.io). The Docker image ca
9571

9672
```yaml
9773
version: "3.7"
98-
74+
9975
services:
10076
headscale:
10177
image: headscale/headscale:0.22.3

mkdocs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,3 @@ nav:
144144
- Proposals:
145145
- ACLs: proposals/001-acls.md
146146
- Better routing: proposals/002-better-routing.md
147-
- Glossary: glossary.md

0 commit comments

Comments
 (0)