Skip to content

fix: reset Tailscale Funnel state on 7.2 restarts#2616

Merged
limetech merged 1 commit into
7.2from
codex/7.2-tailscale-funnel-reset
Apr 14, 2026
Merged

fix: reset Tailscale Funnel state on 7.2 restarts#2616
limetech merged 1 commit into
7.2from
codex/7.2-tailscale-funnel-reset

Conversation

@elibosley
Copy link
Copy Markdown
Member

Summary

  • backport PR fix: reset stale Tailscale funnel/serve state on restart #2600 to 7.2
  • reset persisted Tailscale Funnel and Serve config after tailscale up
  • reapply only the currently configured Docker-template-managed Serve/Funnel mode
  • prevent containers switched to Tailscale Serve = No from keeping stale funnel exposure after restart

Root cause

The container hook persisted serve/funnel state in the Tailscale state directory. When a user changed the Docker template from Funnel or Serve to No, the related env vars disappeared, but the hook never cleared the old state before startup completed.

Source

Cherry-picked from b90ca2f2c9df90bdaca71e3a1a2984b46e83246c / PR #2600.

Verification

  • bash -n share/docker/tailscale_container_hook

- Purpose: backport PR #2600 to the 7.2 branch so Docker template changes clear old Tailscale Serve and Funnel exposure.\n- Before: switching a container from Funnel or Serve to No removed the env vars but left the persisted Tailscale serve/funnel config active after restart.\n- Why: the container hook only applied new serve settings when TAILSCALE_SERVE_PORT was present and never reset existing serve state stored in the Tailscale state directory.\n- What: reset both tailscale funnel and tailscale serve state after tailscale comes online, then reapply the current template-managed mode when configured.\n- How: add explicit reset commands before the Serve/Funnel capability check and before issuing any new serve or funnel command.\n- Source: cherry-picked from b90ca2f.
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 14, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: c20f12b5-2bc0-48a7-9a36-3bee690ec1c4

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/7.2-tailscale-funnel-reset

Comment @coderabbitai help to get the list of available commands and usage tips.

@elibosley elibosley marked this pull request as ready for review April 14, 2026 17:17
@limetech limetech merged commit 1f37e1e into 7.2 Apr 14, 2026
1 check passed
@limetech limetech deleted the codex/7.2-tailscale-funnel-reset branch April 14, 2026 18:06
@github-actions
Copy link
Copy Markdown

🧹 PR Test Plugin Cleaned Up

The test plugin and associated files for this PR have been removed from the preview environment.


🤖 This comment is automatically generated when a PR is closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants