From 6b07ba5f7346e21dfdcba7b6c8efc04bfa223b89 Mon Sep 17 00:00:00 2001 From: "Community Hass.io Add-ons Bot" Date: Sun, 7 Jan 2024 18:52:49 +0000 Subject: [PATCH] :arrow_up: Updating add-on Tailscale to d6d8a51 --- README.md | 6 +++--- tailscale/CHANGELOG.md | 1 + tailscale/DOCS.md | 19 +++++++++++++++---- tailscale/README.md | 4 ++-- tailscale/config.yaml | 3 ++- tailscale/translations/en.yaml | 6 ++++++ 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c6fa0c75a..99a25bc42 100644 --- a/README.md +++ b/README.md @@ -870,10 +870,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/d5c20db -[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/d5c20db/README.md +[addon-tailscale]: https://github.com/hassio-addons/addon-tailscale/tree/d6d8a51 +[addon-doc-tailscale]: https://github.com/hassio-addons/addon-tailscale/blob/d6d8a51/README.md [tailscale-issue]: https://github.com/hassio-addons/addon-tailscale/issues -[tailscale-version-shield]: https://img.shields.io/badge/version-d5c20db-blue.svg +[tailscale-version-shield]: https://img.shields.io/badge/version-d6d8a51-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-no-red.svg diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md index fddc954ec..2cfabcc33 100644 --- a/tailscale/CHANGELOG.md +++ b/tailscale/CHANGELOG.md @@ -1,4 +1,5 @@ # Changelog since v0.13.1 +- Make Proxy and Funnel port configurable (#277) - Use new tailscale cli arguments and merge proxy and funnel into longrun serve service (#306) Co-authored-by: lmagyar diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md index dc923366b..7518aaa82 100644 --- a/tailscale/DOCS.md +++ b/tailscale/DOCS.md @@ -67,6 +67,7 @@ funnel: false log_level: info login_server: "https://controlplane.tailscale.com" proxy: false +proxy_and_funnel_port: 443 snat_subnet_routes: true tags: - tag:example @@ -158,9 +159,9 @@ More information: [Tailscale Funnel][tailscale_info_funnel] **Note**: _After initial setup, it can take up to 10 minutes for the domain to be publicly available._ -**Note:** _You should not use any port number in the URL that you used +**Note:** _You should not use the port number in the URL that you used previously to access Home Assistant. Tailscale Funnel works on the default HTTPS -port 443._ +port 443 (or the port configured in option `proxy_and_funnel_port`)._ **Note:** _If you encounter strange browser behaviour or strange error messages, try to clear all site related cookies, clear all browser cache, restart browser._ @@ -234,9 +235,19 @@ More information: [Enabling HTTPS][tailscale_info_https] 1. Restart the add-on. -**Note:** _You should not use any port number in the URL that you used +**Note:** _You should not use the port number in the URL that you used previously to access Home Assistant. Tailscale Proxy works on the default HTTPS -port 443._ +port 443 (or the port configured in option `proxy_and_funnel_port`)._ + +### Option: `proxy_and_funnel_port` + +This option allows you to configure the port the Tailscale Proxy and Funnel +features are accessible on the tailnet (in case of Tailscale Proxy is enabled) +and optionally on the internet (in case of Tailscale Funnel is also enabled). + +Only port number 443, 8443 and 10000 is allowed by Tailscale. + +When not set, port number 443 is used by default. ### Option: `snat_subnet_routes` diff --git a/tailscale/README.md b/tailscale/README.md index 0dd4dd80b..c9eb0e11d 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-d5c20db-blue.svg -[release]: https://github.com/hassio-addons/addon-tailscale/tree/d5c20db \ No newline at end of file +[release-shield]: https://img.shields.io/badge/version-d6d8a51-blue.svg +[release]: https://github.com/hassio-addons/addon-tailscale/tree/d6d8a51 \ No newline at end of file diff --git a/tailscale/config.yaml b/tailscale/config.yaml index 4987402d9..7b49ec672 100644 --- a/tailscale/config.yaml +++ b/tailscale/config.yaml @@ -1,5 +1,5 @@ name: Tailscale -version: d5c20db +version: d6d8a51 slug: tailscale description: Zero config VPN for building secure networks url: https://github.com/hassio-addons/addon-tailscale @@ -34,6 +34,7 @@ schema: log_level: list(trace|debug|info|notice|warning|error|fatal)? login_server: url? proxy: bool? + proxy_and_funnel_port: list(443|8443|10000)? snat_subnet_routes: bool? tags: - match(^tag:[a-zA-Z0-9]-?[a-zA-Z0-9]+$)? diff --git a/tailscale/translations/en.yaml b/tailscale/translations/en.yaml index 1c01595ce..1e88564be 100644 --- a/tailscale/translations/en.yaml +++ b/tailscale/translations/en.yaml @@ -50,6 +50,12 @@ configuration: 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 disabled by default. + proxy_and_funnel_port: + name: Tailscale Proxy and Funnel port + description: >- + This option allows you to configure the port the Tailscale Proxy and Funnel + features are accessible on. + Only port number 443, 8443 and 10000 is allowed by Tailscale. snat_subnet_routes: name: Source NAT subnet routes description: >-