Fix serve and funnel commands (tailscale-dev#10)

* Fix serve and funnel commands Updates the serve and funnel commands to the new format used in Tailscale version 1.52.0 and above. * Run either serve or funnel, not both
erlend · Nov 2, 2023 · fe75ce9 · fe75ce9
1 parent df22647
commit fe75ce9
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-tailscale-up/run b/root/etc/s6-overlay/s6-rc.d/svc-tailscale-up/run
@@ -24,18 +24,15 @@ fi
 
 tailscale up $FLAGS
 
-# configure serve
+# configure serve or funnel
 if [ -v TAILSCALE_SERVE_PORT ] && [ -v TAILSCALE_SERVE_MODE ]; then
-    if [[ $TAILSCALE_SERVE_MODE == "https" ]]; then
-        tailscale serve "${TAILSCALE_SERVE_MODE}":443 / http://localhost:"${TAILSCALE_SERVE_PORT}"
+
+    if [ -v TAILSCALE_FUNNEL ]; then
+        tailscale funnel --bg --"${TAILSCALE_SERVE_MODE}"=443 http://localhost:"${TAILSCALE_SERVE_PORT}"
     else
-        tailscale serve "${TAILSCALE_SERVE_MODE}":443 http://localhost:"${TAILSCALE_SERVE_PORT}"
+        tailscale serve --bg --"${TAILSCALE_SERVE_MODE}"=443 http://localhost:"${TAILSCALE_SERVE_PORT}"
     fi
-fi
-
-# configure funnel
-if [ -v TAILSCALE_FUNNEL ]; then
-    tailscale funnel 443 on
+
 fi