From 248ef71920f9711130b37f829fae11c4823b405b Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 27 Nov 2025 17:48:28 +0100 Subject: [PATCH] security/tailscale: simplify previous a little --- security/tailscale/pkg-descr | 2 +- .../service/templates/OPNsense/Tailscale/rc.conf.d | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/security/tailscale/pkg-descr b/security/tailscale/pkg-descr index 2720f8a92..b2066fa79 100644 --- a/security/tailscale/pkg-descr +++ b/security/tailscale/pkg-descr @@ -8,7 +8,7 @@ Plugin Changelog 1.3 -* modify rc script to prevent re-using auth key if already authenticated +* modify RC script to prevent re-using auth key if already authenticated 1.2 diff --git a/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d index 2bad6d020..42c21b561 100644 --- a/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d +++ b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d @@ -7,6 +7,7 @@ tailscaled_enable="YES" # see - https://github.com/tailscale/tailscale/issues/5573#issuecomment-1584695981 tailscaled_env="TS_DEBUG_NETSTACK_SUBNETS=0" {% endif %} +tailscaled_up_args_ext= {% if helpers.exists('OPNsense.tailscale.settings.listenPort') %} tailscaled_port="{{ OPNsense.tailscale.settings.listenPort }}" {% endif %} @@ -51,15 +52,13 @@ tailscaled_port="{{ OPNsense.tailscale.settings.listenPort }}" {% endif %} {% if helpers.exists('OPNsense.tailscale.authentication.preAuthKey') %} # Conditionally add auth-key only if not already authenticated -if [ -f /var/db/tailscale/tailscaled.state ] && grep -q '"_current-profile"' /var/db/tailscale/tailscaled.state 2>/dev/null; -then - tailscaled_up_args="{{ up_args|join(' ') }}" -else - tailscaled_up_args="{{ up_args|join(' ') }} --auth-key={{ OPNsense.tailscale.authentication.preAuthKey }}" +if [ -f /var/db/tailscale/tailscaled.state ]; then + if ! grep -q '"_current-profile"' /var/db/tailscale/tailscaled.state; then + tailscaled_up_args_ext="--auth-key={{ OPNsense.tailscale.authentication.preAuthKey }}" + fi fi -{% else %} -tailscaled_up_args="{{ up_args|join(' ') }}" {% endif %} +tailscaled_up_args="{{ up_args|join(' ') }} ${tailscaled_up_args_ext}" {% else %} tailscaled_enable="NO" {% endif %}