Skip to content

Commit

Permalink
luci-app-homeproxy: sync mainline
Browse files Browse the repository at this point in the history 
Signed-off-by: Tianling Shen <[email protected]>
  • Loading branch information
@1715173329
1715173329 committed Jan 6, 2025
1 parent e0bfed8 commit 4ea36db
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions applications/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ return view.extend({
o.rmempty = false;

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('1.1.1.1', _('CloudFlare Public DNS (1.1.1.1)'));
o.value('208.67.222.222', _('Cisco Public DNS (208.67.222.222)'));
Expand Down Expand Up @@ -194,7 +194,7 @@ return view.extend({
}

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('223.5.5.5', _('Aliyun Public DNS (223.5.5.5)'));
o.value('210.2.4.8', _('CNNIC Public DNS (210.2.4.8)'));
Expand Down Expand Up @@ -780,7 +780,7 @@ return view.extend({
so.editable = true;

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.validate = function(section_id, value) {
if (section_id) {
Expand Down
6 changes: 3 additions & 3 deletions applications/luci-app-homeproxy/po/templates/homeproxy.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,7 @@ msgstr ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:159
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 ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:298
Expand Down Expand Up @@ -2182,7 +2182,7 @@ msgstr ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:783
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 ""

#: htdocs/luci-static/resources/view/homeproxy/server.js:677
Expand Down Expand Up @@ -2220,7 +2220,7 @@ msgstr ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:197
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 ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:842
Expand Down
16 changes: 9 additions & 7 deletions applications/luci-app-homeproxy/po/zh_Hans/homeproxy.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2094,8 +2094,8 @@ msgstr ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:159
msgid ""
"Support UDP, TCP, DoH, DoT, DoQ. TCP protocol will be used if not specified."
msgstr "支持 UDP、TCP、DoH、DoT、DoQ。如未指定则使用 TCP 协议。"
"Support UDP, TCP, DoH, DoQ, DoT. TCP protocol will be used if not specified."
msgstr "支持 UDP、TCP、DoH、DoQ、DoT。如未指定则使用 TCP 协议。"

#: htdocs/luci-static/resources/view/homeproxy/client.js:298
msgid "System"
Expand Down Expand Up @@ -2226,8 +2226,8 @@ msgstr ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:783
msgid ""
"The address of the dns server. Support UDP, TCP, DoH, DoT, DoQ and RCode."
msgstr "DNS 服务器的地址。支持 UDP、TCP、DoH、DoT、DoQ 和 RCode。"
"The address of the dns server. Support UDP, TCP, DoH, DoQ, DoT and RCode."
msgstr "DNS 服务器的地址。支持 UDP、TCP、DoH、DoQ、DoT 和 RCode。"

#: htdocs/luci-static/resources/view/homeproxy/server.js:677
msgid ""
Expand Down Expand Up @@ -2278,8 +2278,8 @@ msgstr ""

#: htdocs/luci-static/resources/view/homeproxy/client.js:197
msgid ""
"The dns server for resolving China domains. Support UDP, TCP, DoH, DoT, DoQ."
msgstr "用于解析国内域名的 DNS 服务器。支持 UDP、TCP、DoH、DoT、DoQ。"
"The dns server for resolving China domains. Support UDP, TCP, DoH, DoQ, DoT."
msgstr "用于解析国内域名的 DNS 服务器。支持 UDP、TCP、DoH、DoQ、DoT。"

#: htdocs/luci-static/resources/view/homeproxy/client.js:842
msgid "The domain strategy for resolving the domain name in the address."
Expand Down Expand Up @@ -2403,7 +2403,9 @@ msgstr "微步在线公共 DNS（117.50.10.10）"
msgid ""
"Timeout of rejected DNS response cache in seconds. <code>604800 (7d)</code> "
"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
msgid ""
Expand Down
10 changes: 4 additions & 6 deletions applications/luci-app-homeproxy/root/etc/init.d/homeproxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ start_service() {
procd_set_param respawn
procd_close_instance

case "$rouing_mode" in
case "$routing_mode" in
"bypass_mainland_china")
# Prepare cache db
[ -e "$RUN_DIR/cache.db" ] || touch "$RUN_DIR/cache.db"
Expand All @@ -227,15 +227,13 @@ start_service() {
;;
esac

# Update permissions for ujail
if [ "$outbound_node" != "nil" ]; then
echo > "$RUN_DIR/sing-box-c.log"
chmod 0644 "$HP_DIR/resources/gfw_list.txt"
fi
[ "$outbound_node" = "nil" ] || echo > "$RUN_DIR/sing-box-c.log"
if [ "$server_enabled" = "1" ]; then
echo > "$RUN_DIR/sing-box-s.log"
mkdir -p "$HP_DIR/certs"
fi

# Update permissions for ujail
chown -R sing-box:sing-box "$RUN_DIR"

# Setup firewall
Expand Down

0 comments on commit 4ea36db

Please sign in to comment.