mirror of
https://github.com/opnsense/plugins.git
synced 2026-02-03 20:40:37 -05:00
security/tailscale: simplify previous a little
This commit is contained in:
parent
351090da19
commit
248ef71920
2 changed files with 7 additions and 8 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue