fixup! luci-app-mosdns: Add streaming media DNS server support

Signed-off-by: sbwml <admin@cooluc.com>
This commit is contained in:
sbwml 2024-06-04 07:10:19 +08:00
parent f92c26bb07
commit 7bdd3034f0
3 changed files with 11 additions and 8 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-mosdns PKG_NAME:=luci-app-mosdns
PKG_VERSION:=1.5.21 PKG_VERSION:=1.5.22
PKG_RELEASE:=1 PKG_RELEASE:=1
LUCI_TITLE:=LuCI Support for mosdns LUCI_TITLE:=LuCI Support for mosdns

View File

@ -620,12 +620,14 @@ generate_config() {
json_add_object json_add_object
json_add_string "exec" "jump has_resp_sequence" json_add_string "exec" "jump has_resp_sequence"
json_close_object json_close_object
json_add_object [ "$custom_stream_media_dns" -eq 1 ] && {
json_add_string "exec" "\$query_is_stream_media_domain" json_add_object
json_close_object json_add_string "exec" "\$query_is_stream_media_domain"
json_add_object json_close_object
json_add_string "exec" "jump has_resp_sequence" json_add_object
json_close_object json_add_string "exec" "jump has_resp_sequence"
json_close_object
}
json_add_object json_add_object
json_add_string "exec" "\$query_is_local_domain" json_add_string "exec" "\$query_is_local_domain"
json_close_object json_close_object

View File

@ -151,7 +151,8 @@ v2dat_dump() {
v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat
v2dat unpack geosite -o /var/mosdns -f cn -f apple -f 'geolocation-!cn' $v2dat_dir/geosite.dat v2dat unpack geosite -o /var/mosdns -f cn -f apple -f 'geolocation-!cn' $v2dat_dir/geosite.dat
[ "$adblock" -eq 1 ] && [ $(echo $ad_source | grep -c geosite.dat) -ge '1' ] && v2dat unpack geosite -o /var/mosdns -f category-ads-all $v2dat_dir/geosite.dat [ "$adblock" -eq 1 ] && [ $(echo $ad_source | grep -c geosite.dat) -ge '1' ] && v2dat unpack geosite -o /var/mosdns -f category-ads-all $v2dat_dir/geosite.dat
[ "$streaming_media" -eq 1 ] && v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu $v2dat_dir/geosite.dat [ "$streaming_media" -eq 1 ] && v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu $v2dat_dir/geosite.dat || \
touch /var/mosdns/geosite_disney.txt ; touch /var/mosdns/geosite_netflix.txt ; touch /var/mosdns/geosite_hulu.txt
else else
# custom config # custom config
v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat