zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-homeproxy: sync upstream

Browse Source 
last commit: 23f78cd11d
This commit is contained in:
gitea-action 2025-01-06 13:30:15 +08:00
parent 18f2129a45
commit 04eaf0a43b
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View File

@ -156,7 +156,7 @@ return view.extend({
o.rmempty = false; o.rmempty = false;
o = s.taboption('routing', form.Value, 'dns_server', _('DNS server'), o = s.taboption('routing', form.Value, 'dns_server', _('DNS server'),
_('Support UDP, TCP, DoH, DoT, DoQ. TCP protocol will be used if not specified.')); _('Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified.'));
o.value('wan', _('WAN DNS (read from interface)')); o.value('wan', _('WAN DNS (read from interface)'));
o.value('1.1.1.1', _('CloudFlare Public DNS (1.1.1.1)')); o.value('1.1.1.1', _('CloudFlare Public DNS (1.1.1.1)'));
o.value('208.67.222.222', _('Cisco Public DNS (208.67.222.222)')); o.value('208.67.222.222', _('Cisco Public DNS (208.67.222.222)'));
@ -194,7 +194,7 @@ return view.extend({
} }
o = s.taboption('routing', form.Value, 'china_dns_server', _('China DNS server'), o = s.taboption('routing', form.Value, 'china_dns_server', _('China DNS server'),
_('The dns server for resolving China domains. Support UDP, TCP, DoH, DoT, DoQ.')); _('The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT.'));
o.value('wan', _('WAN DNS (read from interface)')); o.value('wan', _('WAN DNS (read from interface)'));
o.value('223.5.5.5', _('Aliyun Public DNS (223.5.5.5)')); o.value('223.5.5.5', _('Aliyun Public DNS (223.5.5.5)'));
o.value('210.2.4.8', _('CNNIC Public DNS (210.2.4.8)')); o.value('210.2.4.8', _('CNNIC Public DNS (210.2.4.8)'));
@ -780,7 +780,7 @@ return view.extend({
so.editable = true; so.editable = true;
so = ss.option(form.Value, 'address', _('Address'), so = ss.option(form.Value, 'address', _('Address'),
_('The address of the dns server. Support UDP, TCP, DoH, DoT, DoQ and RCode.')); _('The address of the dns server. Support UDP, TCP, DoH, DoQ, DoT and RCode.'));
so.rmempty = false; so.rmempty = false;
so.validate = function(section_id, value) { so.validate = function(section_id, value) {
if (section_id) { if (section_id) {

6
luci-app-homeproxy/po/templates/homeproxy.pot
View File

@ -2054,7 +2054,7 @@ msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:159 #: htdocs/luci-static/resources/view/homeproxy/client.js:159
msgid "" msgid ""
"Support UDP, TCP, DoH, DoT, DoQ. TCP protocol will be used if not specified." "Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified."
msgstr "" msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:298 #: htdocs/luci-static/resources/view/homeproxy/client.js:298
@ -2182,7 +2182,7 @@ msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:783 #: htdocs/luci-static/resources/view/homeproxy/client.js:783
msgid "" msgid ""
"The address of the dns server. Support UDP, TCP, DoH, DoT, DoQ and RCode." "The address of the dns server. Support UDP, TCP, DoH, DoQ, DoT and RCode."
msgstr "" msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/server.js:677 #: htdocs/luci-static/resources/view/homeproxy/server.js:677
@ -2220,7 +2220,7 @@ msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:197 #: htdocs/luci-static/resources/view/homeproxy/client.js:197
msgid "" msgid ""
"The dns server for resolving China domains. Support UDP, TCP, DoH, DoT, DoQ." "The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT."
msgstr "" msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:842 #: htdocs/luci-static/resources/view/homeproxy/client.js:842

16
luci-app-homeproxy/po/zh_Hans/homeproxy.po
View File

@ -2094,8 +2094,8 @@ msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:159 #: htdocs/luci-static/resources/view/homeproxy/client.js:159
msgid "" msgid ""
"Support UDP, TCP, DoH, DoT, DoQ. TCP protocol will be used if not specified." "Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified."
msgstr "支持 UDP、TCP、DoH、DoT、DoQ。如未指定则使用 TCP 协议。" msgstr "支持 UDP、TCP、DoH、DoQ、DoT。如未指定则使用 TCP 协议。"
#: htdocs/luci-static/resources/view/homeproxy/client.js:298 #: htdocs/luci-static/resources/view/homeproxy/client.js:298
msgid "System" msgid "System"
@ -2226,8 +2226,8 @@ msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:783 #: htdocs/luci-static/resources/view/homeproxy/client.js:783
msgid "" msgid ""
"The address of the dns server. Support UDP, TCP, DoH, DoT, DoQ and RCode." "The address of the dns server. Support UDP, TCP, DoH, DoQ, DoT and RCode."
msgstr "DNS 服务器的地址。支持 UDP、TCP、DoH、DoT、DoQ 和 RCode。" msgstr "DNS 服务器的地址。支持 UDP、TCP、DoH、DoQ、DoT 和 RCode。"
#: htdocs/luci-static/resources/view/homeproxy/server.js:677 #: htdocs/luci-static/resources/view/homeproxy/server.js:677
msgid "" msgid ""
@ -2278,8 +2278,8 @@ msgstr ""
#: htdocs/luci-static/resources/view/homeproxy/client.js:197 #: htdocs/luci-static/resources/view/homeproxy/client.js:197
msgid "" msgid ""
"The dns server for resolving China domains. Support UDP, TCP, DoH, DoT, DoQ." "The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT."
msgstr "用于解析国内域名的 DNS 服务器。支持 UDP、TCP、DoH、DoT、DoQ。" msgstr "用于解析国内域名的 DNS 服务器。支持 UDP、TCP、DoH、DoQ、DoT。"
#: htdocs/luci-static/resources/view/homeproxy/client.js:842 #: htdocs/luci-static/resources/view/homeproxy/client.js:842
msgid "The domain strategy for resolving the domain name in the address." msgid "The domain strategy for resolving the domain name in the address."
@ -2403,7 +2403,9 @@ msgstr "微步在线公共 DNS（117.50.10.10）"
msgid "" msgid ""
"Timeout of rejected DNS response cache in seconds. <code>604800 (7d)</code> " "Timeout of rejected DNS response cache in seconds. <code>604800 (7d)</code> "
"is used by default." "is used by default."
msgstr "被拒绝的 DNS 响应缓存超时时间（单位：秒）。默认为 <code>604800（7 天）</code>。" msgstr ""
"被拒绝的 DNS 响应缓存超时时间（单位：秒）。默认为 <code>604800（7 天）</"
"code>。"
#: htdocs/luci-static/resources/view/homeproxy/server.js:485 #: htdocs/luci-static/resources/view/homeproxy/server.js:485
msgid "" msgid ""

22
luci-app-homeproxy/root/etc/init.d/homeproxy
View File

@ -150,7 +150,7 @@ start_service() {
procd_add_jail "sing-box-c" log procfs procd_add_jail "sing-box-c" log procfs
procd_add_jail_mount "$RUN_DIR/sing-box-c.json" procd_add_jail_mount "$RUN_DIR/sing-box-c.json"
procd_add_jail_mount_rw "$RUN_DIR/sing-box-c.log" procd_add_jail_mount_rw "$RUN_DIR/sing-box-c.log"
procd_add_jail_mount_rw "$RUN_DIR/cache.db" [ "$routing_mode" != "bypass_mainland_china" ] || procd_add_jail_mount_rw "$RUN_DIR/cache.db"
procd_add_jail_mount "$HP_DIR/certs/" procd_add_jail_mount "$HP_DIR/certs/"
procd_add_jail_mount "/etc/ssl/" procd_add_jail_mount "/etc/ssl/"
procd_add_jail_mount "/etc/localtime" procd_add_jail_mount "/etc/localtime"
@ -216,20 +216,24 @@ start_service() {
procd_set_param respawn procd_set_param respawn
procd_close_instance procd_close_instance
# Prepare ruleset directory for custom routing mode case "$rouing_mode" in
if [ "$routing_mode" = "custom" ]; then "bypass_mainland_china")
# Prepare cache db
[ -e "$RUN_DIR/cache.db" ] || touch "$RUN_DIR/cache.db"
;;
"custom")
# Prepare ruleset directory
[ -d "$HP_DIR/ruleset" ] || mkdir -p "$HP_DIR/ruleset" [ -d "$HP_DIR/ruleset" ] || mkdir -p "$HP_DIR/ruleset"
fi ;;
esac
# Update permissions for ujail [ "$outbound_node" = "nil" ] || echo > "$RUN_DIR/sing-box-c.log"
if [ "$outbound_node" != "nil" ]; then
echo > "$RUN_DIR/sing-box-c.log"
chmod 0644 "$HP_DIR/resources/gfw_list.txt"
fi
if [ "$server_enabled" = "1" ]; then if [ "$server_enabled" = "1" ]; then
echo > "$RUN_DIR/sing-box-s.log" echo > "$RUN_DIR/sing-box-s.log"
mkdir -p "$HP_DIR/certs" mkdir -p "$HP_DIR/certs"
fi fi
# Update permissions for ujail
chown -R sing-box:sing-box "$RUN_DIR" chown -R sing-box:sing-box "$RUN_DIR"
# Setup firewall # Setup firewall