diff --git a/daed/Makefile b/daed/Makefile index e47a42ee7..a204e34b3 100644 --- a/daed/Makefile +++ b/daed/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=daed PKG_VERSION=0.6.0 -PKG_RELEASE:=64 +PKG_RELEASE:=65 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/daeuniverse/daed.git -PKG_SOURCE_VERSION:=991f627644642c6bdbcbef548474d27a9b679627 +PKG_SOURCE_VERSION:=604e981d433e5132462a7d1e239d41061cd53d59 PKG_MIRROR_HASH:=skip PKG_LICENSE:=AGPL-3.0-only MIT diff --git a/luci-app-nekoclash/Makefile b/luci-app-nekoclash/Makefile index 58632a7a6..541a5c019 100644 --- a/luci-app-nekoclash/Makefile +++ b/luci-app-nekoclash/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Thaolga PKG_NAME:=luci-app-nekoclash PKG_VERSION:=1.3.5 -PKG_RELEASE:=44 +PKG_RELEASE:=45 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/luci-app-nekoclash/htdocs/nekoclash/proxy/1.yaml b/luci-app-nekoclash/htdocs/nekoclash/proxy/1.yaml new file mode 100644 index 000000000..5fe30142d --- /dev/null +++ b/luci-app-nekoclash/htdocs/nekoclash/proxy/1.yaml @@ -0,0 +1 @@ +### sing-box PuerNya 版 内核配置文件 ### \ No newline at end of file diff --git a/luci-app-nekoclash/htdocs/nekoclash/rules/geosite/netflix b/luci-app-nekoclash/htdocs/nekoclash/rules/geosite/netflix new file mode 100644 index 000000000..fab5ff5d5 Binary files /dev/null and b/luci-app-nekoclash/htdocs/nekoclash/rules/geosite/netflix differ diff --git a/luci-app-nekoclash/root/etc/neko/config/Puernya.json b/luci-app-nekoclash/root/etc/neko/config/Puernya.json new file mode 100644 index 000000000..301e426d8 --- /dev/null +++ b/luci-app-nekoclash/root/etc/neko/config/Puernya.json @@ -0,0 +1,800 @@ +{ + "log": { + "level": "error", + "timestamp": true + }, + "dns": { + "servers": [ + { + "tag": "dns_block", + "address": "rcode://success" + }, + { + "tag": "dns_local", + "address": [ + "223.5.5.5", + "119.29.29.29", + "[2400:3200::1]", + "[2400:3200:baba::1]", + "[2402:4e00::]" + ], + "detour": "🎯 全球直连" + }, + { + "tag": "dns_proxy", + "address": [ + "tls://8.8.4.4", + "tls://208.67.222.2" + ], + "client_subnet": "114.114.114.114", + "detour": "🎯 全球直连" + }, + { + "tag": "dns_fakeip", + "address": "fakeip" + } + ], + "rules": [ + { + "outbound": "any", + "server": "dns_local", + "disable_cache": true + }, + { + "domain_suffix": [ + "ghproxy.com", + "jsdelivr.net", + "guangbomi.com", + "oaifree.com" + ], + "server": "dns_local" + }, + { + "clash_mode": "Direct", + "query_type": [ + "A", + "AAAA" + ], + "server": "dns_local" + }, + { + "clash_mode": "Global", + "query_type": [ + "A", + "AAAA" + ], + "server": "dns_proxy" + }, + { + "rule_set": [ + "ads" + ], + "server": "dns_block", + "disable_cache": true, + "rewrite_ttl": 0 + }, + { + "rule_set": [ + "proxy" + ], + "query_type": [ + "A", + "AAAA" + ], + "rewrite_ttl": 1, + "server": "dns_fakeip" + }, + { + "rule_set": [ + "cn" + ], + "query_type": [ + "A", + "AAAA" + ], + "server": "dns_local" + }, + { + "fallback_rules": [ + { + "rule_set": [ + "cnip" + ], + "server": "dns_local" + }, + { + "match_all": true, + "server": "dns_fakeip", + "rewrite_ttl": 1 + } + ], + "server": "dns_proxy" + } + ], + "final": "dns_proxy", + "strategy": "prefer_ipv4", + "independent_cache": true, + "lazy_cache": true, + "reverse_mapping": true, + "mapping_override": true, + "fakeip": { + "enabled": true, + "inet4_range": "198.18.0.0/15", + "inet6_range": "fc00::/18", + "exclude_rule": { + "rule_set": [ + "fakeip-filter", + "private" + ] + } + } + }, + "inbounds": [ + { + "tag": "tun-in", + "type": "tun", + "interface_name": "tun0", + "stack": "mixed", + "inet4_address": [ + "172.19.0.1/30" + ], + "inet6_address": [ + "fdfe:dcba:9876::1/126" + ], + "auto_route": true, + "strict_route": true, + "sniff": true, + "platform": { + "http_proxy": { + "enabled": false, + "server": "0.0.0.0", + "server_port": 1082 + } + } + }, + { + "type": "mixed", + "listen": "0.0.0.0", + "listen_port": 1082, + "sniff": true, + "users": [ + + ] + } + ], + "outbounds": [ + { + "tag": "🚀 节点选择", + "type": "selector", + "outbounds": [ + "♻️ 自动选择", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🌀 手动切换1", + "🌀 手动切换2", + "🐸 其他地区" + ] + }, + { + "tag": "🌀 手动切换1", + "type": "selector", + "use_all_providers": true, + "includes": [ + + ], + "excludes": "(?i)网站|地址|剩余|过期|时间|有效|套餐|到期" + }, + { + "tag": "🌀 手动切换2", + "type": "selector", + "use_all_providers": true, + "includes": [ + + ], + "excludes": "(?i)网站|地址|剩余|过期|时间|有效|套餐|到期" + }, + { + "tag": "🐸 其他地区", + "type": "selector", + "use_all_providers": true, + "includes": [ + + ], + "excludes": "(?i)🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇹🇼|🇰🇷|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates|KR|KOREA|Korea" + }, + { + "tag": "📹 YouTube", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🌀 手动切换1", + "🌀 手动切换2", + "🐸 其他地区" + ] + }, + { + "tag": "🎥 Netflix", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🌀 手动切换1", + "🌀 手动切换2", + "🐸 其他地区" + ] + }, + { + "tag": "🎬 迪士尼+", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🌀 手动切换1", + "🌀 手动切换2", + "🐸 其他地区" + ] + }, + { + "tag": "🤖 人工智能", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🌀 手动切换1", + "🌀 手动切换2", + "🐸 其他地区" + ] + }, + { + "tag": "🎮 游戏服务", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🚀 节点选择" + ] + }, + { + "tag": "🪟 微软服务", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🚀 节点选择" + ] + }, + { + "tag": "🇬 谷歌服务", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🚀 节点选择" + ] + }, + { + "tag": "🍎 苹果服务", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🚀 节点选择" + ] + }, + { + "tag": "🇨🇳 直连域名", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🚀 节点选择" + ] + }, + { + "tag": "🇨🇳 直连 IP", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🚀 节点选择" + ] + }, + { + "tag": "🪜 代理域名", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🎯 全球直连" + ] + }, + { + "tag": "📲 电报消息", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🌀 手动切换1", + "🌀 手动切换2", + "🐸 其他地区" + ] + }, + { + "tag": "🖥️ 直连软件", + "type": "selector", + "outbounds": [ + "🎯 全球直连" + ] + }, + { + "tag": "🔒 私有网络", + "type": "selector", + "outbounds": [ + "🎯 全球直连" + ] + }, + { + "tag": "📈 网络测试", + "type": "selector", + "outbounds": [ + "🎯 全球直连", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🐸 其他地区" + ] + }, + { + "tag": "🎯 全球直连", + "type": "selector", + "outbounds": [ + "DIRECT" + ] + }, + { + "tag": "🛑 广告拦截", + "type": "selector", + "outbounds": [ + "REJECT" + ] + }, + { + "tag": "REJECT", + "type": "block" + }, + { + "tag": "DIRECT", + "type": "direct" + }, + { + "tag": "GLOBAL", + "type": "selector", + "outbounds": [ + "DIRECT", + "REJECT", + "🇭🇰 香港节点", + "🇹🇼 台湾节点", + "🇯🇵 日本节点", + "🇰🇷 韩国节点", + "🇸🇬 狮城节点", + "🇺🇸 美国节点", + "🐸 其他地区" + ] + }, + { + "tag": "dns-out", + "type": "dns" + }, + { + "tag": "🐟 漏网之鱼", + "type": "selector", + "outbounds": [ + "🚀 节点选择", + "🎯 全球直连", + "🐸 其他地区", + "🌀 手动切换1", + "🌀 手动切换2" + ] + }, + { + "tag": "♻️ 自动选择", + "type": "urltest", + "url": "http://www.google-analytics.com/generate_204", + "tolerance": 50, + "use_all_providers": true, + "includes": [ + "🇭🇰|🇯🇵|🇺🇸|🇸🇬|🇹🇼|🇰🇷|港|hk|hongkong|台|tw|taiwan|日|jp|japan|新|sg|singapore|美|us|unitedstates|KR|KOREA|Korea" + ] + }, + { + "tag": "🇭🇰 香港节点", + "type": "selector", + "use_all_providers": true, + "includes": [ + "🇭🇰|香港|HK|HONGKONG|HongKong" + ] + }, + { + "tag": "🇹🇼 台湾节点", + "type": "selector", + "use_all_providers": true, + "includes": [ + "🇹🇼|台湾|TW|TAIWAN|Taiwan" + ] + }, + { + "tag": "🇯🇵 日本节点", + "type": "selector", + "use_all_providers": true, + "includes": [ + "🇯🇵|日本|JP|JAPAN|Japan" + ] + }, + { + "tag": "🇰🇷 韩国节点", + "type": "selector", + "use_all_providers": true, + "includes": [ + "🇰🇷|KR|KOREA|Korea" + ] + }, + { + "tag": "🇸🇬 狮城节点", + "type": "selector", + "use_all_providers": true, + "includes": [ + "🇸🇬|新加坡|SG|SINGAPORE|Singapore" + ] + }, + { + "tag": "🇺🇸 美国节点", + "type": "selector", + "use_all_providers": true, + "includes": [ + "🇺🇸|美国|US|UNITED STATES|United States" + ] + } + ], + "outbound_providers": [ + { + "tag": "🛫 ", + "type": "remote", + "download_url": "https://example.com/xxx/xxx&flag=clash", + "path": "./proxy/1.yaml", + "download_interval": "24h", + "download_ua": "clash.meta", + "includes": [ + + ], + "excludes": "(?i)网站|地址|剩余|过期|时间|有效|套餐|到期", + "healthcheck_url": "https://www.gstatic.com/generate_204", + "healthcheck_interval": "10m" + } + ], + "route": { + "rules": [ + { + "protocol": [ + "dns" + ], + "outbound": "dns-out" + }, + { + "domain_suffix": [ + "linux.do", + "ajay.app", + "returnyoutubedislikeapi.com" + ], + "outbound": "🪜 代理域名" + }, + { + "domain_suffix": [ + "oaifree.com", + "guangbomi.com", + "bootcss.com" + ], + "outbound": "🇨🇳 直连域名" + }, + { + "protocol": [ + "quic" + ], + "outbound": "REJECT" + }, + { + "clash_mode": "Direct", + "outbound": "DIRECT" + }, + { + "clash_mode": "Global", + "outbound": "GLOBAL" + }, + { + "rule_set": [ + "ads" + ], + "outbound": "🛑 广告拦截" + }, + { + "rule_set": [ + "networktest" + ], + "outbound": "📈 网络测试" + }, + { + "rule_set": [ + "applications" + ], + "outbound": "🖥️ 直连软件" + }, + { + "rule_set": [ + "private" + ], + "outbound": "🔒 私有网络" + }, + { + "rule_set": [ + "microsoft-cn" + ], + "outbound": "🪟 微软服务" + }, + { + "rule_set": [ + "apple-cn" + ], + "outbound": "🍎 苹果服务" + }, + { + "rule_set": [ + "google-cn" + ], + "outbound": "🇬 谷歌服务" + }, + { + "rule_set": [ + "games-cn" + ], + "outbound": "🎮 游戏服务" + }, + { + "rule_set": [ + "ai" + ], + "outbound": "🤖 人工智能" + }, + { + "rule_set": [ + "geosite-youtube" + ], + "outbound": "📹 YouTube" + }, + { + "rule_set": [ + "geoip-netflix", + "geosite-netflix" + ], + "outbound": "🎥 Netflix" + }, + { + "rule_set": [ + "geosite-disney" + ], + "outbound": "🎬 迪士尼+" + }, + { + "rule_set": [ + "networktest" + ], + "outbound": "📈 网络测试" + }, + { + "rule_set": [ + "proxy" + ], + "outbound": "🪜 代理域名" + }, + { + "rule_set": [ + "cn" + ], + "outbound": "🇨🇳 直连域名" + }, + { + "rule_set": [ + "telegramip" + ], + "outbound": "📲 电报消息", + "skip_resolve": true + }, + { + "rule_set": [ + "privateip" + ], + "outbound": "🔒 私有网络", + "skip_resolve": true + }, + { + "rule_set": [ + "cnip" + ], + "outbound": "🇨🇳 直连 IP" + } + ], + "rule_set": [ + { + "tag": "fakeip-filter", + "type": "remote", + "format": "binary", + "path": "./rules/fakeip-filter.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/fakeip-filter.srs" + }, + { + "tag": "applications", + "type": "remote", + "format": "binary", + "path": "./rules/applications.srs", + "url": "https://fastly.jsdelivr.net/gh/DustinWin/ruleset_geodata@sing-box-ruleset/applications.srs" + }, + { + "tag": "geosite-youtube", + "type": "remote", + "format": "binary", + "path": "./rules/youtube.srs", + "url": "https://mirror.ghproxy.com/https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/sing/geo/geosite/youtube.srs" + }, + { + "tag": "geosite-disney", + "type": "remote", + "format": "binary", + "path": "./rules/disney.srs", + "url": "https://mirror.ghproxy.com/https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/sing/geo/geosite/disney.srs" + }, + { + "tag": "geoip-netflix", + "type": "remote", + "format": "binary", + "path": "./rules/netflix.srs", + "url": "https://mirror.ghproxy.com/https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/sing/geo/geoip/netflix.srs" + }, + { + "tag": "geosite-netflix", + "type": "remote", + "format": "binary", + "path": "./rules/geosite/netflix.srs", + "url": "https://mirror.ghproxy.com/https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/sing/geo/geosite/netflix.srs" + }, + { + "tag": "ads", + "type": "remote", + "format": "binary", + "path": "./rules/ads.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/ads.srs" + }, + { + "tag": "private", + "type": "remote", + "format": "binary", + "path": "./rules/private.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/private.srs" + }, + { + "tag": "microsoft-cn", + "type": "remote", + "format": "binary", + "path": "./rules/microsoft-cn.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/microsoft-cn.srs" + }, + { + "tag": "apple-cn", + "type": "remote", + "format": "binary", + "path": "./rules/apple-cn.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/apple-cn.srs" + }, + { + "tag": "google-cn", + "type": "remote", + "format": "binary", + "path": "./rules/google-cn.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/google-cn.srs" + }, + { + "tag": "games-cn", + "type": "remote", + "format": "binary", + "path": "./rules/games-cn.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/games-cn.srs" + }, + { + "tag": "ai", + "type": "remote", + "format": "binary", + "path": "./rules/ai.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/ai.srs" + }, + { + "tag": "networktest", + "type": "remote", + "format": "binary", + "path": "./rules/networktest.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/networktest.srs" + }, + { + "tag": "proxy", + "type": "remote", + "format": "binary", + "path": "./rules/proxy.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/proxy.srs" + }, + { + "tag": "cn", + "type": "remote", + "format": "binary", + "path": "./rules/cn.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/cn.srs" + }, + { + "tag": "telegramip", + "type": "remote", + "format": "binary", + "path": "./rules/telegramip.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/telegramip.srs" + }, + { + "tag": "privateip", + "type": "remote", + "format": "binary", + "path": "./rules/privateip.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/privateip.srs" + }, + { + "tag": "cnip", + "type": "remote", + "format": "binary", + "path": "./rules/cnip.srs", + "url": "https://mirror.ghproxy.com/https://github.com/DustinWin/ruleset_geodata/releases/download/sing-box-ruleset/cnip.srs" + } + ], + "final": "🐟 漏网之鱼", + "auto_detect_interface": true, + "override_android_vpn": true, + "concurrent_dial": true + }, + "experimental": { + "cache_file": { + "enabled": true + }, + "clash_api": { + "external_controller": "0.0.0.0:9090", + "external_ui": "/etc/neko/ui", + "secret": "Akun" + } + } +} \ No newline at end of file diff --git a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js index d08f9ffec..66be99525 100644 --- a/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js +++ b/luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js @@ -151,7 +151,7 @@ return view.extend({ 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.rmempty = false; diff --git a/luci-app-tailscale/po/templates/tailscale.pot b/luci-app-tailscale/po/templates/tailscale.pot index baeff13ff..0b5a8f9ed 100644 --- a/luci-app-tailscale/po/templates/tailscale.pot +++ b/luci-app-tailscale/po/templates/tailscale.pot @@ -34,7 +34,7 @@ msgid "Auth Key" msgstr "" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 -msgid "Auto Mesh" +msgid "Accept Routes" msgstr "" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185 diff --git a/luci-app-tailscale/po/zh_Hans/tailscale.po b/luci-app-tailscale/po/zh_Hans/tailscale.po index 9045ad8c7..e67983bab 100644 --- a/luci-app-tailscale/po/zh_Hans/tailscale.po +++ b/luci-app-tailscale/po/zh_Hans/tailscale.po @@ -29,7 +29,7 @@ msgstr "参数列表" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148 msgid "Advanced Settings" -msgstr "高级选项" +msgstr "高级设置" #: 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?" @@ -40,8 +40,8 @@ msgid "Auth Key" msgstr "认证密钥" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 -msgid "Auto Mesh" -msgstr "自动组网" +msgid "Accept Routes" +msgstr "启用路由" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185 msgid "Available flags" @@ -49,7 +49,7 @@ msgstr "可用参数" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113 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:122 @@ -82,7 +82,7 @@ msgstr "广播子网路由至 Tailscale,例如:10.0.0.0/24。" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183 msgid "Extra Settings" -msgstr "附加选项" +msgstr "附加设置" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134 msgid "Firewall Mode" diff --git a/luci-app-tailscale/po/zh_Hant/tailscale.po b/luci-app-tailscale/po/zh_Hant/tailscale.po index cbf581a2e..dfb3e5ece 100644 --- a/luci-app-tailscale/po/zh_Hant/tailscale.po +++ b/luci-app-tailscale/po/zh_Hant/tailscale.po @@ -29,7 +29,7 @@ msgstr "參數列表" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:148 msgid "Advanced Settings" -msgstr "高級選項" +msgstr "高級設置" #: 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?" @@ -40,8 +40,8 @@ msgid "Auth Key" msgstr "認證密鑰" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:150 -msgid "Auto Mesh" -msgstr "自動組網" +msgid "Accept Routes" +msgstr "啟用路由" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:185 msgid "Available flags" @@ -49,7 +49,7 @@ msgstr "可用參數" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:113 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:122 @@ -82,7 +82,7 @@ msgstr "廣播子網路由至 Tailscale,例如:10.0.0.0/24。" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:183 msgid "Extra Settings" -msgstr "附加選項" +msgstr "附加設置" #: luci-app-tailscale/htdocs/luci-static/resources/view/tailscale/setting.js:134 msgid "Firewall Mode" diff --git a/luci-app-tailscale/root/etc/init.d/tailscale b/luci-app-tailscale/root/etc/init.d/tailscale index 3bdd4c654..69f40baf6 100755 --- a/luci-app-tailscale/root/etc/init.d/tailscale +++ b/luci-app-tailscale/root/etc/init.d/tailscale @@ -45,7 +45,7 @@ custom_instance() { [ "$acceptDNS" = "0" ] && ARGS="$ARGS --accept-dns=false" [ "$advertiseExitNode" = "1" ] && ARGS="$ARGS --advertise-exit-node" [ -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 "$loginServer" ] && ARGS="$ARGS --login-server=$loginServer" [ -n "$authkey" ] && ARGS="$ARGS --authkey=$authkey" @@ -86,8 +86,8 @@ custom_instance() { fi fi - config_get_bool acceptRoutes $cfg 'acceptRoutes' - if [ "$acceptRoutes" == "1" ]; then + config_get access $cfg 'access' + if [ -n "$access" ]; then if [ -z "$(uci -q get firewall.tszone)" ]; then uci set firewall.tszone='zone' uci set firewall.tszone.input='ACCEPT' @@ -101,7 +101,6 @@ custom_instance() { uci -q delete firewall.tszone fi - config_get access $cfg 'access' if [ "${access//tsfwlan/}" != "$access" ]; then uci set firewall.tsfwlan=forwarding uci set firewall.tsfwlan.dest='lan' diff --git a/minieap-openwrt/Makefile b/minieap-openwrt/Makefile index e50fefdef..b6f978759 100644 --- a/minieap-openwrt/Makefile +++ b/minieap-openwrt/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minieap PKG_VERSION:=0.93.7 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_MAINTAINER:=lala PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE @@ -10,7 +10,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/AutoCONFIG/minieap.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=983fd4a5851d4a344fab92666c5cdb83f26b2294 +PKG_SOURCE_VERSION:=null PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz include $(INCLUDE_DIR)/package.mk