code enhancement

tailscale/rootfs/etc/s6-overlay/s6-rc.d/post-tailscaled/run

@@ -89,17 +89,20 @@ do
   sleep 2
 done
 
+bashio::log.info "Tailscale is running"
+
 # Warn about key expiration
 if keyexpiry=$(/opt/tailscale status --self=true --peers=false --json | jq -rce '.Self.KeyExpiry'); then
   bashio::log.warning "The connection's key will expire on: ${keyexpiry}"
   bashio::log.warning "Consider disabling key expiry to avoid losing connection to your Home Assistant device."
   bashio::log.warning "Please check your configuration based on the add-on's documentation under \"Configuration\""
 fi
 
-bashio::log.info "Tailscale is running"
-
-# Notify about colliding subnet routes if non-userspace-networking is enabled
-if bashio::config.false "userspace_networking"; then
+# Warn about colliding subnet routes if non-userspace networking and accepting routes are enabled
+if bashio::config.false "userspace_networking" && \
+  (! bashio::config.has_value "accept_routes" || \
+    bashio::config.true "accept_routes");
+then
   readarray -t colliding_routes < <( \
     comm -1 -2 \
       <(subnet-routes local) \
@@ -117,12 +120,12 @@ if bashio::config.false "userspace_networking"; then
   done
 fi
 
-# Warn about userspace networking
+# Notify about userspace networking
 if ! bashio::config.has_value "userspace_networking" || \
     bashio::config.true "userspace_networking";
 then
   bashio::log.notice "The add-on uses userspace networking mode."
   bashio::log.notice "If you need to access other clients on your tailnet from your Home Assistant instance,"
   bashio::log.notice "disable userspace networking mode, that will create a \"tailscale0\" network interface on your host."
-  bashio::log.notice "Please check your configuration based on the add-on's Documentation under \"Option: userspace_networking\""
+  bashio::log.notice "Please check your configuration based on the add-on's documentation under \"Option: userspace_networking\""
 fi

tailscale/rootfs/etc/s6-overlay/s6-rc.d/proxy/run

@@ -51,7 +51,7 @@ if bashio::config.true 'proxy'; then
     bashio::exit.nok
   fi
   bashio::log.info "Tailscale Proxy is enabled:"
-  bashio::log.info "  Your Home Assistant instance is available within your Tailnet VPN at"
+  bashio::log.info "  Your Home Assistant instance is available within your tailnet VPN at"
   bashio::log.info "  https://${domain}"
 
 fi

tailscale/rootfs/etc/s6-overlay/s6-rc.d/tailscaled/run

@@ -28,7 +28,7 @@ if bashio::debug ; then
   exec /opt/tailscaled "${options[@]}"
 else
   bashio::log.notice \
-    "Tailscale logs will be suppressed after 200 lines, set add-on's "\
+    "Tailscale logs will be suppressed after 200 lines, set add-on's" \
     "configuration option 'log_level' to 'debug' to see further logs"
 
   /opt/tailscaled "${options[@]}" 2>&1 \

tailscale/rootfs/etc/s6-overlay/s6-rc.d/web/run

@@ -3,7 +3,7 @@
 # ==============================================================================
 # Home Assistant Community Add-on: Tailscale
 # Runs tailscale web interface
-# =============================================================================
+# ==============================================================================
 declare -a options
 
 bashio::log.info 'Starting Tailscale web...'

tailscale/rootfs/etc/s6-overlay/scripts/stage2_hook.sh

@@ -5,18 +5,23 @@
 # S6 Overlay stage2 hook to customize services
 # ==============================================================================
 
-# Disable protect-subnets service when userspace-networking is enabled
-# Disable mss-clamping service when userspace-networking is enabled
+# Disable protect-subnets service when userspace-networking is enabled or accepting routes is disabled
 if ! bashio::config.has_value "userspace_networking" || \
-    bashio::config.true "userspace_networking";
+    bashio::config.true "userspace_networking" || \
+    bashio::config.false "accept_routes";
 then
     rm /etc/s6-overlay/s6-rc.d/user/contents.d/protect-subnets
     rm /etc/s6-overlay/s6-rc.d/post-tailscaled/dependencies.d/protect-subnets
+fi
 
+# Disable mss-clamping service when userspace-networking is enabled
+if ! bashio::config.has_value "userspace_networking" || \
+    bashio::config.true "userspace_networking";
+then
     rm /etc/s6-overlay/s6-rc.d/user/contents.d/mss-clamping
 fi
 
-# Disable taildrop service when it is has been explicitly disabled
+# Disable taildrop service when it has been explicitly disabled
 if bashio::config.false 'taildrop'; then
     rm /etc/s6-overlay/s6-rc.d/user/contents.d/taildrop
 fi