From 0b9582ed050dc0c32688d52cb9463e7c9241d42e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 20 Sep 2020 13:03:25 +0800 Subject: [PATCH] OpenClash: sync with upstream source --- .../ctcgfw/luci-app-openclash/files/etc/config/openclash | 6 ------ .../ctcgfw/luci-app-openclash/files/etc/init.d/openclash | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/package/ctcgfw/luci-app-openclash/files/etc/config/openclash b/package/ctcgfw/luci-app-openclash/files/etc/config/openclash index ed5ba07143..5d0856b8b4 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/config/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/config/openclash @@ -52,12 +52,6 @@ config dns_servers option ip '223.5.5.5' option enabled '1' -config dns_servers - option enabled '1' - option group 'nameserver' - option ip 'doh.rixcloud.dev/dns-query' - option type 'https' - config dns_servers option type 'https' option group 'fallback' diff --git a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash index d6fedc4dfe..e9151823a4 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -122,6 +122,7 @@ kill_clash() yml_merge() { #合并文件 +sed -i "s/^ \{0,\}Proxy:/proxies:/g" "$PROXY_FILE" 2>/dev/null cat "$CHANGE_FILE" "$DNS_FILE" "$PROXY_PROVIDER_FILE" "$PROXY_FILE" "$GROUP_FILE" "$RULE_PROVIDER_FILE" "$SCRIPT_FILE" "$RULE_FILE" > "$CONFIG_FILE" 2>/dev/null } @@ -277,7 +278,6 @@ yml_dns_check() cat >> "$DNS_FILE" <<-EOF - 114.114.114.114 - 119.29.29.29 - - https://doh.rixcloud.dev/dns-query fallback: - https://cloudflare-dns.com/dns-query - https://dns.google/dns-query @@ -1446,7 +1446,6 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then nohup /usr/share/openclash/openclash_core.sh "$core_type" & exit 0 } - sed -i "s/^ \{0,\}Proxy:/proxies:/g" "$CONFIG_FILE" 2>/dev/null ulimit -SHn 65535 2>/dev/null config_reload=$(uci get openclash.config.config_reload 2>/dev/null) if [ -n "$(pidof clash)" ] && [ "$core_type" != "Tun" ] && [ "$config_reload" != "0" ]; then