From d545826ccade621727217ca088e1741d2119a1f1 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 12 Jul 2023 23:02:53 +0800 Subject: [PATCH] fix(init): fix proxy list condition --- htdocs/luci-static/resources/view/homeproxy/client.js | 2 +- root/etc/init.d/homeproxy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/luci-static/resources/view/homeproxy/client.js b/htdocs/luci-static/resources/view/homeproxy/client.js index 9eb25a33..c9f6ae90 100644 --- a/htdocs/luci-static/resources/view/homeproxy/client.js +++ b/htdocs/luci-static/resources/view/homeproxy/client.js @@ -216,7 +216,7 @@ return view.extend({ } o = s.taboption('routing', form.Value, 'routing_port', _('Routing ports'), - _('Specify target port(s) that get proxied. Multiple ports must be separated by commas.')); + _('Specify target ports to be proxied. Multiple ports must be separated by commas.')); o.value('all', _('All ports')); o.value('common', _('Common ports only (bypass P2P traffic)')); o.default = 'common'; diff --git a/root/etc/init.d/homeproxy b/root/etc/init.d/homeproxy index d8df625e..7b13b826 100755 --- a/root/etc/init.d/homeproxy +++ b/root/etc/init.d/homeproxy @@ -106,7 +106,7 @@ start_service() { ;; esac - if [ "$routing_mode" != "custom" ] && [ -s "$DNSMASQ_DIR/proxy_list.conf" ]; then + if [ "$routing_mode" != "custom" ] && [ -s "$HP_DIR/resources/proxy_list.txt" ]; then [ "$ipv6_support" -eq "0" ] || local wan_nftset_v6=",6#inet#fw4#homeproxy_wan_proxy_addr_v6" sed -r -e '/^\s*$/d' -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_wan_proxy_addr_v4$wan_nftset_v6/g" \ "$HP_DIR/resources/proxy_list.txt" > "$DNSMASQ_DIR/proxy_list.conf" @@ -351,5 +351,5 @@ reload_service() { service_triggers() { procd_add_reload_trigger "$CONF" - procd_add_interface_trigger "interface.*.up" wan /etc/init.d/$CONF restart + procd_add_interface_trigger "interface.*.up" wan /etc/init.d/$CONF reload }