update-12.26
This commit is contained in:
parent
8563d21228
commit
db6ea4c60b
|
@ -986,10 +986,10 @@ start(){
|
|||
uci -q del dhcp.lan.dhcp_option
|
||||
uci -q add_list dhcp.lan.dhcp_option="6,$(uci -q get network.lan.ipaddr)"
|
||||
uci commit dhcp
|
||||
masqport="$(uci -q get AdGuardHome.AdGuardHome.old_port)"
|
||||
adgconf="$(uci -q get AdGuardHome.AdGuardHome.configpath)"
|
||||
[ "$masqport" ] || masqport="$(grep " port:.*" $adgconf | cut -f 4 -d " ")"
|
||||
[ -s $adgconf ] && cat $adgconf | tr '\n' '\r' | sed -e "s/upstream_dns:.*upstream_dns_file/upstream_dns:\n - 127.0.0.1:$masqport\n upstream_dns_file/" | tr '\r' '\n' >$adgconf
|
||||
masqport="$(grep " port:.*" $adgconf | cut -f 4 -d " ")"
|
||||
[ -s $adgconf ] && adgc="$(cat $adgconf | tr '\n' '\r' | sed -e "s/upstream_dns:.*upstream_dns_file/upstream_dns:\n - 127.0.0.1:$masqport\n upstream_dns_file/" | tr '\r' '\n')"
|
||||
[ -n "$adgc" ] && echo "${adgc}" >$adgconf
|
||||
uci -q set AdGuardHome.AdGuardHome.enabled='1'
|
||||
uci -q set AdGuardHome.AdGuardHome.redirect='exchange'
|
||||
uci commit AdGuardHome
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -8,7 +8,6 @@ rules:
|
|||
- RULE-SET,Bilibili,Asian TV
|
||||
- RULE-SET,IQ,Asian TV
|
||||
- RULE-SET,IQIYI,Asian TV
|
||||
- RULE-SET,HBO Go,Asian TV
|
||||
- RULE-SET,Letv,Asian TV
|
||||
- RULE-SET,Netease Music,Asian TV
|
||||
- RULE-SET,Tencent Video,Asian TV
|
||||
|
@ -26,6 +25,7 @@ rules:
|
|||
- RULE-SET,encoreTVB,Global TV
|
||||
- RULE-SET,Fox Now,Global TV
|
||||
- RULE-SET,Fox+,Global TV
|
||||
- RULE-SET,HBO Go,Global TV
|
||||
- RULE-SET,HBO Max,Global TV
|
||||
- RULE-SET,Hulu Japan,Global TV
|
||||
- RULE-SET,Hulu,Global TV
|
||||
|
@ -66,7 +66,6 @@ script:
|
|||
"Bilibili": "Asian TV",
|
||||
"IQ": "Asian TV",
|
||||
"IQIYI": "Asian TV",
|
||||
"HBO Go": "Asian TV",
|
||||
"Letv": "Asian TV",
|
||||
"Netease Music": "Asian TV",
|
||||
"Tencent Video": "Asian TV",
|
||||
|
@ -84,6 +83,7 @@ script:
|
|||
"encoreTVB": "Global TV",
|
||||
"Fox Now": "Global TV",
|
||||
"Fox+": "Global TV",
|
||||
"HBO Go": "Global TV",
|
||||
"HBO Max": "Global TV",
|
||||
"Hulu Japan": "Global TV",
|
||||
"Hulu": "Global TV",
|
||||
|
@ -190,12 +190,6 @@ rule-providers:
|
|||
url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/IQIYI.yaml
|
||||
path: "./Rules/Media/IQYI"
|
||||
interval: 86400
|
||||
HBO Go:
|
||||
type: http
|
||||
behavior: classical
|
||||
url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/HBO%20Go.yaml
|
||||
path: "./Rules/Media/HBO_Go"
|
||||
interval: 86400
|
||||
Letv:
|
||||
type: http
|
||||
behavior: classical
|
||||
|
@ -304,6 +298,12 @@ rule-providers:
|
|||
url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/Fox%2B.yaml
|
||||
path: "./Rules/Media/Fox+"
|
||||
interval: 86400
|
||||
HBO Go:
|
||||
type: http
|
||||
behavior: classical
|
||||
url: https://cdn.jsdelivr.net/gh/lhie1/Rules@master/Clash/Provider/Media/HBO%20Go.yaml
|
||||
path: "./Rules/Media/HBO_Go"
|
||||
interval: 86400
|
||||
HBO Max:
|
||||
type: http
|
||||
behavior: classical
|
||||
|
|
|
@ -997,7 +997,7 @@ cat >> "$SERVER_FILE" <<-EOF
|
|||
- name: HBO Go
|
||||
type: select
|
||||
proxies:
|
||||
- Asian TV
|
||||
- Global TV
|
||||
- DIRECT
|
||||
EOF
|
||||
cat /tmp/Proxy_Server >> $SERVER_FILE 2>/dev/null
|
||||
|
|
|
@ -331,7 +331,7 @@ if [ "$2" != "0" ]; then
|
|||
x.to_s.gsub(/,Bilibili,Asian TV$/, ',Bilibili,$Bilibili#d')
|
||||
.gsub(/,Bahamut,Global TV$/, ',Bahamut,$Bahamut#d')
|
||||
.gsub(/,HBO Max,Global TV$/, ',HBO Max,$HBOMax#d')
|
||||
.gsub(/,HBO Go,Asian TV$/, ',HBO Go,$HBOGo#d')
|
||||
.gsub(/,HBO Go,Global TV$/, ',HBO Go,$HBOGo#d')
|
||||
.gsub(/,Pornhub,Global TV$/, ',Pornhub,$Pornhub#d')
|
||||
.gsub(/,Global TV$/, ',$GlobalTV#d')
|
||||
.gsub(/,Asian TV$/, ',$AsianTV#d')
|
||||
|
@ -356,7 +356,7 @@ if [ "$2" != "0" ]; then
|
|||
Value['script']['code'].to_s.gsub!(/\"Bilibili\": \"Asian TV\"/,'\"Bilibili\": \"$Bilibili#d\"')
|
||||
.gsub!(/\"Bahamut\": \"Global TV\"/,'\"Bahamut\": \"$Bahamut#d\"')
|
||||
.gsub!(/\"HBO Max\": \"Global TV\"/,'\"HBO Max\": \"$HBOMax#d\"')
|
||||
.gsub!(/\"HBO Go\": \"Asian TV\"/,'\"HBO Go\": \"$HBOGo#d\"')
|
||||
.gsub!(/\"HBO Go\": \"Global TV\"/,'\"HBO Go\": \"$HBOGo#d\"')
|
||||
.gsub!(/\"Pornhub\": \"Global TV\"/,'\"Pornhub\": \"$Pornhub#d\"')
|
||||
.gsub!(/: \"Global TV\"/,': \"$GlobalTV#d\"')
|
||||
.gsub!(/: \"Asian TV\"/,': \"$AsianTV#d\"')
|
||||
|
|
Loading…
Reference in New Issue