update-02.16

luci-app-mosdns/root/etc/mosdns/serverlist.txt

@@ -1412,6 +1412,7 @@ abjjsc.cn
 ablatesgascon.cam
 ableaborah.com
 ablebodiedcool.com
+ablebodiedfibre.com
 ablerivetdoubted.com
 ablesasme.co
 ablink.comms.trainline.com
@@ -2986,6 +2987,7 @@ agacelebir.com
 agadum.com
 agaenteitor.com
 againd.name
+againedam.com
 againstperfectlywrench.com
 agathaedith.com
 agauxietor.com
@@ -3541,6 +3543,7 @@ api.lab.amplitude.com
 api.rudderlabs.com
 api2.amplitude.com
 apiecelee.com
+apio.ink
 apistat.gao7.com
 apistat.wasu.cn
 apjiangte.com
@@ -4730,6 +4733,7 @@ bestrevenuenetwork.com
 bestsearch.net
 bestssn.com
 bestzba.com
+beta-news.org
 betahit.click
 betemolgar.com
 betgorebysson.club
@@ -5040,6 +5044,7 @@ bngpt.com
 bngwlt.com
 bnhtml.com
 bnjxyqdvoegi.com
+bnkpgjw.cn
 bnmjjwinf292.com
 bnmla.com
 bnnapbth.com
@@ -5621,6 +5626,7 @@ captainbicycle.com
 captivatecustomergentlemen.com
 capultytrese.xyz
 capyestern.com
+capzo.cn
 car.qcmrjx.com
 carabidshooter.com
 caraganaarborescenspendula.com
@@ -5702,6 +5708,7 @@ cawkyhouhere.com
 cawrlfug.com
 cawsspjzhtgz.com
 cb.baidu.com
+cb8lvgd.cn
 cba-fed-igh.com
 cbanners.virtuagirlhd.com
 cbba8228b1.com
@@ -5896,6 +5903,8 @@ cfpl.online
 cfrsqptn.com
 cfts1tifqr.com
 cfvapda.cn
+cfwchydynfc.com
+cfwchydynfc.top
 cfyao.club
 cgiale.com
 cgicounter.puretec.de
@@ -6978,6 +6987,7 @@ cryartarm.online
 crypto-loot.org
 crypto-news-world.club
 crystalproducerhurried.com
+crytyingcrutch.com
 crywl.com
 cs12d.com
 csalsylqx.com
@@ -7123,6 +7133,7 @@ cyitohoteasqwe.top
 cyjaruvndimgaa.com
 cykynethe.com
 cyneburg-yam.com
+cynthet.com
 cyperjs.cn
 cyrasi.com
 cyruqdmagde.xyz
@@ -8175,6 +8186,7 @@ dmvbonnha.com
 dmxftmoqz.com
 dmxleo.dailymotion.com
 dmym.aixyy.com
+dmz3nd5oywtsw.cloudfront.net
 dmzjmp.com
 dn*.ixinwei.com
 dn3uy6cx65ujf.cloudfront.net
@@ -8395,6 +8407,7 @@ ds88pc0kw6cvc.cloudfront.net
 dsandexpe.biz
 dscenn.com
 dscloud.ltd
+dscmcbov.com
 dsdsds8848.xyz
 dsfjhfhyry2hh8jo09.com
 dsh7ky7308k4b.cloudfront.net
@@ -8598,6 +8611,7 @@ e0a42e1a21669b.com
 e0hkzk2.cn
 e13085e58935e6.com
 e18a97eee94d0f2519.com
+e1f95201b19594.site
 e21b1642db801b2a.com
 e2a1c91d8b.com
 e2ertt.com
@@ -8845,6 +8859,7 @@ ehinkitwkuo.co
 ehnjtmqchrub.com
 ehu96t2p.com
 eiasia.ltd
+eiasninancu.com
 eidsign.com.cn
 eifold.com
 eighteenmedal.com
@@ -10741,6 +10756,7 @@ go.icann.org
 go.pornav.net
 go.strpjmp.com
 go.trvdp.com
+go.usa.gov
 go.xxxiijmp.com
 go06.cc
 go07.cc
@@ -11491,6 +11507,7 @@ helltraffic.com
 helpbeatlestribute.com
 helpinfo.cn
 hempunevenfeminist.com
+hemquotedchamber.com
 hemtatch.net
 henanfs.com
 henanlinyu.cn
@@ -11986,6 +12003,7 @@ hufwitew.com
 hugeincome.cf
 hugelyantony.com
 hugexdeal.com
+hughester.com
 hugiffamopfrge.top
 huglivoa.net
 hugregregy.pro
@@ -12972,6 +12990,7 @@ jessicalaurax.com
 jessieemys.com
 jessieflown.com
 jestmonths.com
+jesult.com
 jetsowilk.com
 jettrujole.com
 jetx.info
@@ -12984,6 +13003,7 @@ jfjsp.com
 jfqkj.com
 jfqzwsczsf.com
 jfsm5.top
+jfvmafyksfj.top
 jfypfmew.com
 jgchq.com
 jgcq3003.com
@@ -13047,6 +13067,7 @@ jigdigtry.com
 jighucme.com
 jiglarexi.com
 jigred.com
+jigsawhybrid.com
 jigsawpopcorn.com
 jigsawthirsty.com
 jijunlongchengxinxi.cn
@@ -13657,6 +13678,7 @@ kfd3sm2c.com
 kfluoa.com
 kfuiprtjuqntp.com
 kfweo2.com
+kfxfcofkumv.top
 kfyg.xyz
 kg8l81yh7vnf.com
 kgdvs9ov3l2aasw4nuts.com
@@ -13698,6 +13720,7 @@ kilin.xyz
 killerparadehay.com
 killingwirelesshumiliation.com
 kindads.com
+kindeargrain.com
 kindlyfeebleremembered.com
 kingads.mobi
 kingithinref.club
@@ -13776,6 +13799,7 @@ km1.muhoujiemi.com
 kmacon.com
 kmbyktnb.com
 kmovuj.com
+kmoxhjwng.com
 kmpiframe.keepmeposted.com.mt
 kmpkedsbdb.com
 kmqkdhqaqt.com
@@ -13861,6 +13885,7 @@ kowqxog.cn
 koxeebee.net
 kpirog.com
 kplanet.cn
+kpmmthnpqoc.xyz
 kpshx.douguo.com
 kpu.samsungelectronics.com
 kpuqwdqsol.xyz
@@ -14805,6 +14830,7 @@ ly5200.cn
 lyadu.com
 lyaeccn.com
 lyatblkpblca.com
+lyautotech.club
 lyceasannop.com
 lychangxu.cn
 lycooc.com
@@ -16622,6 +16648,7 @@ ntebfvnpmf.xyz
 nterbx.com
 ntfirstleap.cn
 ntheenclo.club
+nthxbfedxfkpx.com
 ntiveandi.biz
 ntjanyc.cn
 ntkjbweenycfq.com
@@ -16822,6 +16849,7 @@ obviousmanipulate.com
 obyjpiok.com
 oc2tdxocb3ae0r.com
 occultcreed.com
+occupyskinnymaggot.com
 occursexpertloving.com
 occxfzqyhhq.com
 ocdnmq.com
@@ -16960,6 +16988,7 @@ oksdyydvwrbrjf.xyz
 okshuwu.top
 oktpage.com
 okueroskynt.com
+okupsudd.work
 okwan.cn
 olayz.cn
 olderdiverge.com
@@ -19008,6 +19037,7 @@ qkspafpgg.com
 qksrv.net
 qksz.net
 qktbbiavkqcqmn.com
+qktfwkftgqeynnp.com
 ql.tc
 ql.uzuzuz.com
 qlmqzznfcb.com
@@ -19079,6 +19109,7 @@ qrlsx.com
 qrzlaatf.xyz
 qs01.cn
 qsart.cn
+qscidskqz.com
 qscwdv.top
 qservz.com
 qshxc.com
@@ -19474,6 +19505,7 @@ redresseducatedage.com
 redshell.io
 reducedgulliblepeevish.com
 reducingcommission.com
+reductionjogvast.com
 redundancyphilosophicalwest.com
 reduxmedia.com
 redvxjlmaehy.com
@@ -19839,6 +19871,7 @@ rjtpos.cn
 rkomf.com
 rkpecade.com
 rktupt.cn
+rkumsvlvfeeewog.xyz
 rkxkesgncpkcf.xyz
 rkyijdrys.com
 rl-mb90b39t.cn
@@ -21799,6 +21832,7 @@ sunnysun.co
 sunsekrious.com
 sunsetencyclopaedia.com
 suntiz.com
+sunwardamoraic.com
 suoooi.cn
 super.cat898.com
 super.kdnet.net
@@ -22501,6 +22535,7 @@ tidint.pro
 tidydownright.com
 tiedme.com
 tielengthenelaborate.com
+tienu.tech
 tieqifeng.com
 tigerhub.net
 tigerhysteriaspree.com
@@ -24061,6 +24096,7 @@ voawhooh.net
 vobquhydgvyqf.com
 vocationethelsky.com
 vocoat.com
+vodobyve.pro
 voevtwfpd.xyz
 vogo-vogo.ru
 vogueoatgap.com
@@ -25806,6 +25842,7 @@ yixui.com
 yiydtredbofv.com
 yiyu-fz.cn
 yiyuantian.com
+yiyuwl.cn
 yizhanghaoquan.pw
 yjbuhao.top
 yjegf.com
@@ -25977,6 +26014,7 @@ yrzdbzq.cn
 ys.muhoujiemi.com
 ys2000.cdn.bcebos.com
 ysclub.top
+ysczggasfx.com
 ysdtcdnoox.com
 ysfc360.cn
 ysgqfroqbqk.xyz
@@ -26279,6 +26317,7 @@ zgsxhx.com
 zgtcar.com
 zgunion.cn
 zgvcfridw.com
+zgwxt.vip
 zgxieshou.com
 zgyemy.com
 zgyso.cn
@@ -26607,6 +26646,7 @@ zxdb123caducn.xyz
 zxglpj.cn
 zxgroymagqu.com
 zxhrq.cn
+zxhstudy.online
 zxhymh.com
 zxin131.cn
 zxjjzx.com

luci-app-wizard/root/etc/init.d/wizard

@@ -28,13 +28,17 @@ add_wizard() {
 		pppoe)
 			config_get wan_pppoe_user "$cfg" wan_pppoe_user
 			config_get wan_pppoe_pass "$cfg" wan_pppoe_pass
-			[[ -n "${wan_pppoe_user} != $(uci -q get network.wan.username)" || -n "${wan_pppoe_pass} != $(uci -q get network.wan.password)" ]] && {
+			[[ "${wan_pppoe_user} != $(uci -q get network.wan.username)" || "${wan_pppoe_pass} != $(uci -q get network.wan.password)" ]] && {
 				uci delete network.wan
 				uci set network.wan=interface
 				uci set network.wan.proto='pppoe'
 				uci set network.wan.device="$device"
 				uci set network.wan.username="${wan_pppoe_user}"
 				uci set network.wan.password="${wan_pppoe_pass}"
+				[ -n "${ipv6}" ] && {
+					uci -q set network.wan.ipv6='0'
+					uci -q set network.wan.delegate='0'
+				}
 			}
 		;;
 	esac

my-default-settings/files/etc/config/nginx

@@ -7,6 +7,7 @@ config server '_lan'
 	list listen '[::]:80 default_server'
 	option server_name 'op'
 	option index 'luci index.html index.htm'
+	list rewrite '"^/$" $scheme://$host/luci/ permanent'
 	list include 'conf.d/*.locations'
 	option access_log 'off; # logd openwrt'
 	
@@ -15,6 +16,7 @@ config server '_ssl'
 	list listen '[::]:443 ssl'
 	option server_name '_ssl'
 	option index 'luci index.html index.htm'
+	list rewrite '"^/$" $scheme://$host/luci/ permanent'
 	list include 'conf.d/*.locations'
 	option ssl_certificate '/etc/nginx/conf.d/_lan.crt'
 	option ssl_certificate_key '/etc/nginx/conf.d/_lan.key'

my-default-settings/files/etc/uci-defaults/95-default-settings

@@ -1,8 +1,10 @@
 #!/bin/sh
 
-grep -q "luci index.html" /etc/config/nginx || {
+grep -q "host/luci" /etc/config/nginx || {
 	uci -q set nginx._lan.index="luci index.html index.htm"
 	uci -q set nginx._ssl.index="luci index.html index.htm"
+	uci -q add_list nginx._lan.rewrite='"^/$" $scheme://$host/luci/ permanent'
+	uci -q add_list nginx._ssl.rewrite='"^/$" $scheme://$host/luci/ permanent'
 	uci commit nginx
 	service nginx reload
 }