diff --git a/README.md b/README.md
index 76a5681ea..f25963d2d 100644
--- a/README.md
+++ b/README.md
@@ -939,10 +939,10 @@ SOFTWARE.
[vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
[vscode-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
[vscode-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
-[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/08c01f6
-[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/08c01f6/README.md
+[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/0fd8c31
+[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/0fd8c31/README.md
[tailscale-issue]: https://github.com/hassio-addons/addon-tailscale/issues
-[tailscale-version-shield]: https://img.shields.io/badge/version-08c01f6-blue.svg
+[tailscale-version-shield]: https://img.shields.io/badge/version-0fd8c31-blue.svg
[tailscale-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
[tailscale-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
[tailscale-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md
index 1ba78b9ac..a6275ab25 100644
--- a/tailscale/CHANGELOG.md
+++ b/tailscale/CHANGELOG.md
@@ -1,4 +1,5 @@
# Changelog since v0.11.1
+- Rearrange proxy documentation into alphabetical order (#240)
- Do not opt out of client log upload in debug log level (#212)
- Remove duplicate status checks from dependent S6 services (#196)
- Create fallback page for iOS browsers failing to open Tailscale login page (#198)
diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md
index f313a5b75..ee3bda158 100644
--- a/tailscale/DOCS.md
+++ b/tailscale/DOCS.md
@@ -59,11 +59,11 @@ accept_dns: true
advertise_exit_node: true
log_level: info
login_server: "https://controlplane.tailscale.com"
+proxy: true
tags:
- tag:example
- tag:homeassistant
taildrop: true
-proxy: true
```
### Option: `accept_dns`
@@ -120,23 +120,6 @@ the default (`https://controlplane.tailscale.com`). This is useful if you
are running your own Tailscale control server, for example, a self-hosted
[Headscale] instance.
-### Option: `tags`
-
-This option allows you to specify specific ACL tags for this Tailscale
-instance. They need to start with `tag:`.
-
-More information:
-
-### Option: `taildrop`
-
-This add-on support [Tailscale's Taildrop][taildrop] feature, which allows
-you to send files to your Home Assistant instance from other Tailscale
-devices.
-
-When not set, this option is enabled by default.
-
-Received files are stored in the `/share/taildrop` directory.
-
### Option: `proxy`
When not set, this option is enabled by default.
@@ -180,6 +163,23 @@ More information: [Enabling HTTPS][tailscale_info_https]
previously to access Home Assistant. Tailscale Proxy works on the default HTTPS
port 443._
+### Option: `tags`
+
+This option allows you to specify specific ACL tags for this Tailscale
+instance. They need to start with `tag:`.
+
+More information:
+
+### Option: `taildrop`
+
+This add-on support [Tailscale's Taildrop][taildrop] feature, which allows
+you to send files to your Home Assistant instance from other Tailscale
+devices.
+
+When not set, this option is enabled by default.
+
+Received files are stored in the `/share/taildrop` directory.
+
## Changelog & Releases
This repository keeps a change log using [GitHub's releases][releases]
diff --git a/tailscale/README.md b/tailscale/README.md
index 5e954ead3..05bedc5d8 100644
--- a/tailscale/README.md
+++ b/tailscale/README.md
@@ -48,5 +48,5 @@ If you are more interested in stable releases of our add-ons:
[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
[patreon]: https://www.patreon.com/frenck
[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
-[release-shield]: https://img.shields.io/badge/version-08c01f6-blue.svg
-[release]: https://github.com/hassio-addons/addon-tailscale/tree/08c01f6
\ No newline at end of file
+[release-shield]: https://img.shields.io/badge/version-0fd8c31-blue.svg
+[release]: https://github.com/hassio-addons/addon-tailscale/tree/0fd8c31
\ No newline at end of file
diff --git a/tailscale/config.yaml b/tailscale/config.yaml
index 0c8480031..a531e6320 100644
--- a/tailscale/config.yaml
+++ b/tailscale/config.yaml
@@ -1,5 +1,5 @@
name: Tailscale
-version: 08c01f6
+version: 0fd8c31
slug: tailscale
description: Zero config VPN for building secure networks
url: https://github.com/hassio-addons/addon-tailscale
@@ -30,8 +30,8 @@ schema:
advertise_exit_node: bool?
log_level: list(trace|debug|info|notice|warning|error|fatal)?
login_server: url?
+ proxy: bool?
tags:
- match(^tag:[a-zA-Z0-9]-?[a-zA-Z0-9]+$)?
taildrop: bool?
- proxy: bool?
image: ghcr.io/hassio-addons/tailscale/{arch}
diff --git a/tailscale/translations/en.yaml b/tailscale/translations/en.yaml
index 8a6346d34..698b1ab13 100644
--- a/tailscale/translations/en.yaml
+++ b/tailscale/translations/en.yaml
@@ -24,6 +24,12 @@ configuration:
This option allows you to specify a custom control server for this
Tailscale instance, for example, a self-host Headscale instance.
By default, it uses the control server provided by Tailscale.
+ proxy:
+ name: Tailscale Proxy
+ description: >-
+ This option allows you to enable Tailscale's Proxy feature to present your
+ Home Assistant instance on your tailnet with a valid certificate.
+ When not set, this option is enabled by default.
tags:
name: Tags
description: >-
@@ -35,9 +41,3 @@ configuration:
This option allows you to enable Taildrop, a file sharing service
that allows you to share files with other Tailscale nodes.
When not set, this option is enabled by default.
- proxy:
- name: Tailscale Proxy
- description: >-
- This option allows you to enable Tailscale's Proxy feature to present your
- Home Assistant instance on your tailnet with a valid certificate.
- When not set, this option is enabled by default.