domenico/luci-app-tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary param associations

Browse Source 
fix #8 and fix #18
This commit is contained in:
asvow
2024-09-23 10:53:43 +08:00
parent 904a791708
commit 8bb754dc7c
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -8,7 +8,7 @@ LUCI_TITLE:=LuCI for Tailscale
LUCI_DEPENDS:=+tailscale LUCI_DEPENDS:=+tailscale
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_VERSION:=1.1.2 PKG_VERSION:=1.1.3
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

2
htdocs/luci-static/resources/view/tailscale/setting.js
View File

@@ -151,7 +151,7 @@ return view.extend({
s.tab('advance',_('Advanced Settings')); s.tab('advance',_('Advanced Settings'));
o = s.taboption('advance',form.Flag, 'acceptRoutes', _('Auto Mesh'), _('Accept subnet routes that other nodes advertise.')); o = s.taboption('advance',form.Flag, 'acceptRoutes', _('Accept Routes'), _('Accept subnet routes that other nodes advertise.'));
o.default = o.disabled; o.default = o.disabled;
o.rmempty = false; o.rmempty = false;

2
po/templates/tailscale.pot
View File

@@ -34,7 +34,7 @@ msgid "Auth Key"
msgstr "" msgstr ""
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150
msgid "Auto Mesh" msgid "Accept Routes"
msgstr "" msgstr ""
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185

10
po/zh_Hans/tailscale.po
View File

@@ -29,7 +29,7 @@ msgstr "参数列表"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148
msgid "Advanced Settings" msgid "Advanced Settings"
msgstr "高级选项" msgstr "高级设置"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:99 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:99
msgid "Are you sure you want to logout and unbind the current device?" msgid "Are you sure you want to logout and unbind the current device?"
@@ -40,8 +40,8 @@ msgid "Auth Key"
msgstr "认证密钥" msgstr "认证密钥"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150
msgid "Auto Mesh" msgid "Accept Routes"
msgstr "自动组网" msgstr "启用路由"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185
msgid "Available flags" msgid "Available flags"
@@ -49,7 +49,7 @@ msgstr "可用参数"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113
msgid "Basic Settings" msgid "Basic Settings"
msgstr "基础选项" msgstr "基础设置"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:108 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:108
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:122 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:122
@@ -82,7 +82,7 @@ msgstr "广播子网路由至 Tailscale，例如：<code>10.0.0.0/24</code>。"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183
msgid "Extra Settings" msgid "Extra Settings"
msgstr "附加选项" msgstr "附加设置"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134
msgid "Firewall Mode" msgid "Firewall Mode"

10
po/zh_Hant/tailscale.po
View File

@@ -29,7 +29,7 @@ msgstr "參數列表"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148
msgid "Advanced Settings" msgid "Advanced Settings"
msgstr "高級選項" msgstr "高級設置"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:99 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:99
msgid "Are you sure you want to logout and unbind the current device?" msgid "Are you sure you want to logout and unbind the current device?"
@@ -40,8 +40,8 @@ msgid "Auth Key"
msgstr "認證密鑰" msgstr "認證密鑰"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150
msgid "Auto Mesh" msgid "Accept Routes"
msgstr "自動組網" msgstr "啟用路由"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185
msgid "Available flags" msgid "Available flags"
@@ -49,7 +49,7 @@ msgstr "可用參數"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113
msgid "Basic Settings" msgid "Basic Settings"
msgstr "基礎選項" msgstr "基礎設置"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:108 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:108
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:122 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:122
@@ -82,7 +82,7 @@ msgstr "廣播子網路由至 Tailscale，例如：<code>10.0.0.0/24</code>。"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183
msgid "Extra Settings" msgid "Extra Settings"
msgstr "附加選項" msgstr "附加設置"
#: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134 #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134
msgid "Firewall Mode" msgid "Firewall Mode"

7
root/etc/init.d/tailscale
View File

@@ -45,7 +45,7 @@ custom_instance() {
[ "$acceptDNS" = "0" ] && ARGS="$ARGS --accept-dns=false" [ "$acceptDNS" = "0" ] && ARGS="$ARGS --accept-dns=false"
[ "$advertiseExitNode" = "1" ] && ARGS="$ARGS --advertise-exit-node" [ "$advertiseExitNode" = "1" ] && ARGS="$ARGS --advertise-exit-node"
[ -n "$advertiseRoutes" ] && ARGS="$ARGS --advertise-routes=$advertiseRoutes" [ -n "$advertiseRoutes" ] && ARGS="$ARGS --advertise-routes=$advertiseRoutes"
[ "$s2s" = "1" ] && ARGS="$ARGS --snat-subnet-routes=false --stateful-filtering=false" [ "$s2s" = "1" ] && ARGS="$ARGS --snat-subnet-routes=false"
[ -n "$flags" ] && ARGS="$ARGS $flags" [ -n "$flags" ] && ARGS="$ARGS $flags"
[ -n "$loginServer" ] && ARGS="$ARGS --login-server=$loginServer" [ -n "$loginServer" ] && ARGS="$ARGS --login-server=$loginServer"
[ -n "$authkey" ] && ARGS="$ARGS --authkey=$authkey" [ -n "$authkey" ] && ARGS="$ARGS --authkey=$authkey"
@@ -86,8 +86,8 @@ custom_instance() {
fi fi
fi fi
config_get_bool acceptRoutes $cfg 'acceptRoutes' config_get access $cfg 'access'
if [ "$acceptRoutes" == "1" ]; then if [ -n "$access" ]; then
if [ -z "$(uci -q get firewall.tszone)" ]; then if [ -z "$(uci -q get firewall.tszone)" ]; then
uci set firewall.tszone='zone' uci set firewall.tszone='zone'
uci set firewall.tszone.input='ACCEPT' uci set firewall.tszone.input='ACCEPT'
@@ -101,7 +101,6 @@ custom_instance() {
uci -q delete firewall.tszone uci -q delete firewall.tszone
fi fi
config_get access $cfg 'access'
if [ "${access//tsfwlan/}" != "$access" ]; then if [ "${access//tsfwlan/}" != "$access" ]; then
uci set firewall.tsfwlan=forwarding uci set firewall.tsfwlan=forwarding
uci set firewall.tsfwlan.dest='lan' uci set firewall.tsfwlan.dest='lan'