fix: allow config to force port 41641

Signed-off-by: Derek Kaser <[email protected]>
dkaser · Jul 12, 2024 · 2fca805 · 2fca805
1 parent 2deed24
commit 2fca805
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/usr/local/emhttp/plugins/tailscale/Tailscale-1-Settings.page b/src/usr/local/emhttp/plugins/tailscale/Tailscale-1-Settings.page
@@ -73,7 +73,7 @@ Tag="gears"
 ### <?= _tr("settings.services") ?>
 
 <?= _tr("settings.wireguard") ?>
-: <input type="number" name="WG_PORT" class="narrow" min="1" max="65535" value="<?=$tailscale_config['WG_PORT']?>" placeholder="41641">
+: <input type="number" name="WG_PORT" class="narrow" min="0" max="65535" value="<?=$tailscale_config['WG_PORT']?>" placeholder="0">
 
 > <?= _tr("settings.context.wireguard") ?>
 

diff --git a/src/usr/local/emhttp/plugins/tailscale/include/pre-startup/custom_params.php b/src/usr/local/emhttp/plugins/tailscale/include/pre-startup/custom_params.php
@@ -2,11 +2,9 @@
 
 $custom_params = "";
 
-if ($tailscale_config['WG_PORT'] != "41641") {
-    $wgport = intval($tailscale_config['WG_PORT']);
-    if ($wgport > 0 && $wgport < 65535) {
-        $custom_params .= "-port {$wgport} ";
-    }
+$wgport = intval($tailscale_config['WG_PORT']);
+if ($wgport > 0 && $wgport < 65535) {
+    $custom_params .= "-port {$wgport} ";
 }
 
 file_put_contents('/usr/local/emhttp/plugins/tailscale/custom-params.sh', 'TAILSCALE_CUSTOM_PARAMS="' . $custom_params . '"');
diff --git a/src/usr/local/emhttp/plugins/tailscale/settings.json b/src/usr/local/emhttp/plugins/tailscale/settings.json
@@ -24,7 +24,7 @@
     "description": "Tailscale enabled"
   },
   "WG_PORT": {
-    "default": "41641",
+    "default": "0",
     "description": "Port for Wireguard connections"
   }
 }