Skip to content

Commit

Permalink
Rename namespace to user in docs
Browse files Browse the repository at this point in the history
Signed-off-by: Kristoffer Dalby <[email protected]>
  • Loading branch information
kradalby authored and juanfont committed Jan 18, 2023
1 parent bf0b85f commit fb3e2dc
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions config-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ dns_config:
# Defines the base domain to create the hostnames for MagicDNS.
# `base_domain` must be a FQDNs, without the trailing dot.
# The FQDN of the hosts will be
# `hostname.namespace.base_domain` (e.g., _myhost.mynamespace.example.com_).
# `hostname.user.base_domain` (e.g., _myhost.myuser.example.com_).
base_domain: example.com

# Unix socket used for the CLI to connect without authentication
Expand Down Expand Up @@ -301,9 +301,9 @@ unix_socket_permission: "0770"
# - [email protected]
#
# If `strip_email_domain` is set to `true`, the domain part of the username email address will be removed.
# This will transform `[email protected]` to the namespace `first-name.last-name`
# This will transform `[email protected]` to the user `first-name.last-name`
# If `strip_email_domain` is set to `false` the domain part will NOT be removed resulting to the following
# namespace: `first-name.last-name.example.com`
# user: `first-name.last-name.example.com`
#
# strip_email_domain: true

Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ written by community members. It is _not_ verified by `headscale` developers.
Headscale implements the same policy ACLs as Tailscale.com, adapted to the self-hosted environment.

For instance, instead of referring to users when defining groups you must
use namespaces (which are the equivalent to user/logins in Tailscale.com).
use users (which are the equivalent to user/logins in Tailscale.com).

This comment has been minimized.

Copy link
@alex1702

alex1702 Mar 30, 2023

This sentence somehow no longer makes sense. I am not so powerful in the English language (I only use deepl to translate ^^) to rephrase it.


Please check https://tailscale.com/kb/1018/acls/, and `./tests/acls/` in this repo for working examples.

When using ACL's the Namespace borders are no longer applied. All machines
whichever the Namespace have the ability to communicate with other hosts as
When using ACL's the User borders are no longer applied. All machines
whichever the User have the ability to communicate with other hosts as
long as the ACL's permits this exchange.

The [ACLs](acls.md) document should help understand a fictional case of setting
Expand Down
10 changes: 5 additions & 5 deletions docs/acls.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ servers.

## ACL setup

Note: Namespaces will be created automatically when users authenticate with the
Note: Users will be created automatically when users authenticate with the
Headscale server.

ACLs could be written either on [huJSON](https://github.com/tailscale/hujson)
or YAML. Check the [test ACLs](../tests/acls) for further information.

When registering the servers we will need to add the flag
`--advertise-tags=tag:<tag1>,tag:<tag2>`, and the user (namespace) that is
`--advertise-tags=tag:<tag1>,tag:<tag2>`, and the user that is
registering the server should be allowed to do it. Since anyone can add tags to
a server they can register, the check of the tags is done on headscale server
and only valid tags are applied. A tag is valid if the namespace that is
and only valid tags are applied. A tag is valid if the user that is
registering it is allowed to do it.

Here are the ACL's to implement the same permissions as above:
Expand Down Expand Up @@ -164,8 +164,8 @@ Here are the ACL's to implement the same permissions as above:
"dst": ["tag:dev-app-servers:80,443"]
},

// We still have to allow internal namespaces communications since nothing guarantees that each user have
// their own namespaces.
// We still have to allow internal users communications since nothing guarantees that each user have
// their own users.
{ "action": "accept", "src": ["boss"], "dst": ["boss:*"] },
{ "action": "accept", "src": ["dev1"], "dst": ["dev1:*"] },
{ "action": "accept", "src": ["dev2"], "dst": ["dev2:*"] },
Expand Down
8 changes: 4 additions & 4 deletions docs/glossary.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Glossary

| Term | Description |
| --------- | --------------------------------------------------------------------------------------------------------------------- |
| Machine | A machine is a single entity connected to `headscale`, typically an installation of Tailscale. Also known as **Node** |
| Namespace | A namespace is a logical grouping of machines "owned" by the same entity, in Tailscale, this is typically a User |
| Term | Description |
| --------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
| Machine | A machine is a single entity connected to `headscale`, typically an installation of Tailscale. Also known as **Node** |
| Namespace | A namespace was a logical grouping of machines "owned" by the same entity, in Tailscale, this is typically a User (This is now called user) |
4 changes: 2 additions & 2 deletions docs/oidc.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ oidc:
- [email protected]

# If `strip_email_domain` is set to `true`, the domain part of the username email address will be removed.
# This will transform `[email protected]` to the namespace `first-name.last-name`
# This will transform `[email protected]` to the user `first-name.last-name`
# If `strip_email_domain` is set to `false` the domain part will NOT be removed resulting to the following
# namespace: `first-name.last-name.example.com`
# user: `first-name.last-name.example.com`
strip_email_domain: true
```
Expand Down
8 changes: 4 additions & 4 deletions docs/running-headscale-container.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ Verify `headscale` is available:
curl http://127.0.0.1:9090/metrics
```

6. Create a namespace ([tailnet](https://tailscale.com/kb/1136/tailnet/)):
6. Create a user ([tailnet](https://tailscale.com/kb/1136/tailnet/)):

```shell
docker exec headscale \
headscale namespaces create myfirstnamespace
headscale users create myfirstuser
```

### Register a machine (normal login)
Expand All @@ -120,7 +120,7 @@ To register a machine when running `headscale` in a container, take the headscal

```shell
docker exec headscale \
headscale --namespace myfirstnamespace nodes register --key <YOU_+MACHINE_KEY>
headscale --user myfirstuser nodes register --key <YOU_+MACHINE_KEY>
```

### Register machine using a pre authenticated key
Expand All @@ -129,7 +129,7 @@ Generate a key using the command line:

```shell
docker exec headscale \
headscale --namespace myfirstnamespace preauthkeys create --reusable --expiration 24h
headscale --user myfirstuser preauthkeys create --reusable --expiration 24h
```

This will return a pre-authenticated key that can be used to connect a node to `headscale` during the `tailscale` command:
Expand Down
8 changes: 4 additions & 4 deletions docs/running-headscale-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ Verify `headscale` is available:
curl http://127.0.0.1:9090/metrics
```

8. Create a namespace ([tailnet](https://tailscale.com/kb/1136/tailnet/)):
8. Create a user ([tailnet](https://tailscale.com/kb/1136/tailnet/)):

```shell
headscale namespaces create myfirstnamespace
headscale users create myfirstuser
```

### Register a machine (normal login)
Expand All @@ -95,15 +95,15 @@ tailscale up --login-server YOUR_HEADSCALE_URL
Register the machine:

```shell
headscale --namespace myfirstnamespace nodes register --key <YOU_+MACHINE_KEY>
headscale --user myfirstuser nodes register --key <YOU_+MACHINE_KEY>
```

### Register machine using a pre authenticated key

Generate a key using the command line:

```shell
headscale --namespace myfirstnamespace preauthkeys create --reusable --expiration 24h
headscale --user myfirstuser preauthkeys create --reusable --expiration 24h
```

This will return a pre-authenticated key that can be used to connect a node to `headscale` during the `tailscale` command:
Expand Down
8 changes: 4 additions & 4 deletions docs/running-headscale-openbsd.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ Verify `headscale` is available:
curl http://127.0.0.1:9090/metrics
```

6. Create a namespace ([tailnet](https://tailscale.com/kb/1136/tailnet/)):
6. Create a user ([tailnet](https://tailscale.com/kb/1136/tailnet/)):

```shell
headscale namespaces create myfirstnamespace
headscale users create myfirstuser
```

### Register a machine (normal login)
Expand All @@ -133,15 +133,15 @@ tailscale up --login-server YOUR_HEADSCALE_URL
Register the machine:

```shell
headscale --namespace myfirstnamespace nodes register --key <YOU_+MACHINE_KEY>
headscale --user myfirstuser nodes register --key <YOU_+MACHINE_KEY>
```

### Register machine using a pre authenticated key

Generate a key using the command line:

```shell
headscale --namespace myfirstnamespace preauthkeys create --reusable --expiration 24h
headscale --user myfirstuser preauthkeys create --reusable --expiration 24h
```

This will return a pre-authenticated key that can be used to connect a node to `headscale` during the `tailscale` command:
Expand Down

0 comments on commit fb3e2dc

Please sign in to comment.