From 5dfabc410409285ebb7a0a5549832af139e96a3e Mon Sep 17 00:00:00 2001 From: Laszlo Magyar Date: Tue, 21 May 2024 22:01:47 +0200 Subject: [PATCH 1/5] fix grammar --- tailscale/DOCS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md index 8638ed0f..b460bfb7 100644 --- a/tailscale/DOCS.md +++ b/tailscale/DOCS.md @@ -372,7 +372,7 @@ router, and this simplifies routing configuration. When not set, this option is enabled by default. To support advanced [Site-to-site networking][tailscale_info_site_to_site] (eg. -to traverse multiple networks), you can disable this functionality, and execute +to traverse multiple networks), you can disable this functionality, and follow steps 2 and 3 as described on [Site-to-site networking][tailscale_info_site_to_site]. But do it only when you really understand why you need this. @@ -416,7 +416,7 @@ instance, disable userspace networking mode, which will create a `tailscale0` network interface on your host. If you want to access other clients on your tailnet even from your local subnet, -execute steps 2 and 3 as described on [Site-to-site +follow steps 2 and 3 as described on [Site-to-site networking][tailscale_info_site_to_site]. In case your local subnets collide with subnet routes within your tailnet, your From def5fb07db3c950b20a0884505011ff83f3eef6b Mon Sep 17 00:00:00 2001 From: Laszlo Magyar Date: Wed, 22 May 2024 13:47:01 +0200 Subject: [PATCH 2/5] Fix default value for stateful_filtering in documentation --- tailscale/DOCS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md index b460bfb7..962c6dad 100644 --- a/tailscale/DOCS.md +++ b/tailscale/DOCS.md @@ -112,7 +112,7 @@ login_server: "https://controlplane.tailscale.com" proxy: false proxy_and_funnel_port: 443 snat_subnet_routes: true -stateful_filtering: true +stateful_filtering: false tags: - tag:example - tag:homeassistant From f3575ce08775b33232eade391bacf3b9c5373cfd Mon Sep 17 00:00:00 2001 From: Laszlo Magyar Date: Wed, 22 May 2024 21:05:06 +0200 Subject: [PATCH 3/5] Revert "Linux optimizations for subnet routers and exit nodes" --- tailscale/Dockerfile | 1 - .../etc/s6-overlay/s6-rc.d/post-tailscaled/run | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/tailscale/Dockerfile b/tailscale/Dockerfile index 81b6cb42..9839baa0 100755 --- a/tailscale/Dockerfile +++ b/tailscale/Dockerfile @@ -10,7 +10,6 @@ ARG BUILD_ARCH=amd64 ARG TAILSCALE_VERSION="v1.66.4" RUN \ apk add --no-cache \ - ethtool=6.6-r0 \ ipcalc=1.0.3-r0 \ iproute2=6.6.0-r0 \ iptables=1.8.10-r3 \ diff --git a/tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run b/tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run index d94d7d41..875360db 100755 --- a/tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run +++ b/tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run @@ -4,7 +4,6 @@ # Home Assistant Community Add-on: Tailscale # Runs after the machine has been logged in into the Tailscale network # ============================================================================== -declare interface declare -a options declare -a routes=() declare route @@ -13,20 +12,6 @@ declare login_server declare tags declare keyexpiry -# Linux optimizations for subnet routers and exit nodes -# Based on: https://tailscale.com/kb/1320/performance-best-practices#linux-optimizations-for-subnet-routers-and-exit-nodes -# Note: Changes made via ethtool are not persistent and will be lost after the machine shuts down -# Note: Executing it before "tailscale up" to avoid warning messages -for interface in $( \ - { ip -4 route show 0/0; ip -6 route show ::/0; } \ - | { grep -E '^default\svia\s\S+\sdev\s\S+' || true ;} \ - | cut -f5 -d' ' \ - | sort -u) -do - bashio::log.info "Allow UDP GRO for forwarding on ${interface}" - ethtool -K "${interface}" rx-udp-gro-forwarding on rx-gro-list off -done - # Default options options+=(--hostname "$(bashio::info.hostname)") From ad148f34a2edafe65a2f0958cdd45862735a41fd Mon Sep 17 00:00:00 2001 From: Laszlo Magyar Date: Wed, 22 May 2024 21:35:22 +0200 Subject: [PATCH 4/5] update changelog and custom docs --- tailscale/CHANGELOG.md | 4 ++++ tailscale/DOCS.md | 5 +---- tailscale/README.md | 5 +---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md index 27e68ddf..a02027f7 100644 --- a/tailscale/CHANGELOG.md +++ b/tailscale/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## vNext (forked) + +- Revert "Linux optimizations for subnet routers and exit nodes" + ## 0.19.0.1 (forked) - Merge unreleased changes from community add-on diff --git a/tailscale/DOCS.md b/tailscale/DOCS.md index 962c6dad..b8fc051e 100644 --- a/tailscale/DOCS.md +++ b/tailscale/DOCS.md @@ -6,10 +6,7 @@ > > Changes: > - Release unreleased changes from community add-on: -> - Update tailscale/tailscale to v1.66.4 -> - Stateful filtering is now off by default -> - Skip default networks without a gateway to enable UDP GRO for forwarding -> - Update Add-on base image to v15.0.9 +> - Revert "Linux optimizations for subnet routers and exit nodes" > - Release unmerged changes from community add-on: > - Optionally copy Tailscale Proxy's certificate files to /ssl folder diff --git a/tailscale/README.md b/tailscale/README.md index 996e1015..80a1b30d 100644 --- a/tailscale/README.md +++ b/tailscale/README.md @@ -8,10 +8,7 @@ Zero config VPN for building secure networks. > > Changes: > - Release unreleased changes from community add-on: -> - Update tailscale/tailscale to v1.66.4 -> - Stateful filtering is now off by default -> - Skip default networks without a gateway to enable UDP GRO for forwarding -> - Update Add-on base image to v15.0.9 +> - Revert "Linux optimizations for subnet routers and exit nodes" > - Release unmerged changes from community add-on: > - Optionally copy Tailscale Proxy's certificate files to /ssl folder From 475b811d1614d3b606c02aee63677158a40752ed Mon Sep 17 00:00:00 2001 From: Laszlo Magyar Date: Wed, 22 May 2024 21:36:02 +0200 Subject: [PATCH 5/5] bump version --- tailscale/CHANGELOG.md | 2 +- tailscale/config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tailscale/CHANGELOG.md b/tailscale/CHANGELOG.md index a02027f7..00a54e85 100644 --- a/tailscale/CHANGELOG.md +++ b/tailscale/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## vNext (forked) +## 0.19.1.1 (forked) - Revert "Linux optimizations for subnet routers and exit nodes" diff --git a/tailscale/config.yaml b/tailscale/config.yaml index e700f8c1..cc3ccdf5 100644 --- a/tailscale/config.yaml +++ b/tailscale/config.yaml @@ -1,6 +1,6 @@ --- name: Tailscale with features -version: 0.19.0.1 +version: 0.19.1.1 slug: tailscale description: Zero config VPN for building secure networks url: https://github.com/lmagyar/homeassistant-addon-tailscale