From a2b5c4ae63371bc7212d0231e3f57f5c73b5de7e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 26 Feb 2022 09:06:16 +0800
Subject: [PATCH] update-02.26

---
 .../luasrc/model/cbi/dockerman/container.lua  | 12 ++---
 .../root/etc/mosdns/serverlist.txt            | 45 +++++++++++++++++--
 mosdns/Makefile                               |  2 +-
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua b/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua
index 12df9e929..20220ad8f 100644
--- a/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua
+++ b/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua
@@ -714,13 +714,14 @@ elseif action == "console" then
 			if not cmd_docker or not cmd_ttyd or cmd_docker:match("^%s+$") or cmd_ttyd:match("^%s+$") then
 				return
 			end
+			local uci = (require "luci.model.uci").cursor()
 
-			local ttyd_ssl = uci.get("ttyd", "@ttyd[0]", "ssl")
-			local ttyd_ssl_key = uci.get("ttyd", "@ttyd[0]", "ssl_key")
-			local ttyd_ssl_cert = uci.get("ttyd", "@ttyd[0]", "ssl_cert")
+			local ttyd_ssl = uci:get("ttyd", "@ttyd[0]", "ssl")
+			local ttyd_ssl_key = uci:get("ttyd", "@ttyd[0]", "ssl_key")
+			local ttyd_ssl_cert = uci:get("ttyd", "@ttyd[0]", "ssl_cert")
 
-			if ttyd_ssl=="1" and ttyd_ssl_cert and ttyd_ssl_key then
-				cmd_ttyd=string.format('%s -S -C %s -K %s',cmd_ttyd,ttyd_ssl_cert,ttyd_ssl_key)
+			if ttyd_ssl == "1" and ttyd_ssl_cert and ttyd_ssl_key then
+				cmd_ttyd = string.format('%s -S -C %s -K %s', cmd_ttyd, ttyd_ssl_cert, ttyd_ssl_key)
 			end
 
 			local pid = luci.util.trim(luci.util.exec("netstat -lnpt | grep :7682 | grep ttyd | tr -s ' ' | cut -d ' ' -f7 | cut -d'/' -f1"))
@@ -729,7 +730,6 @@ elseif action == "console" then
 			end
 
 			local hosts
-			local uci = (require "luci.model.uci").cursor()
 			local remote = uci:get_bool("dockerd", "dockerman", "remote_endpoint") or false
 			local host = nil
 			local port = nil
diff --git a/luci-app-mosdns/root/etc/mosdns/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/serverlist.txt
index 95edcd952..302b81cdb 100644
--- a/luci-app-mosdns/root/etc/mosdns/serverlist.txt
+++ b/luci-app-mosdns/root/etc/mosdns/serverlist.txt
@@ -496,6 +496,7 @@
 31365y.com
 31du.wang
 32.huanqiu.com
+3201556.site
 321.jintang114.org
 32a79e2833309ebe.com
 32fd7f438cb.com
@@ -939,6 +940,7 @@
 75bb9a4031.com
 761f1b3960.com
 76aede7d9af.com
+76doyxyw.cn
 76e.org
 76xs.com
 7705a9f168.com
@@ -2143,7 +2145,6 @@ ads.boylesports.com
 ads.brabys.com
 ads.brazzers.com
 ads.bumq.com
-ads.businessweek.com
 ads.canalblog.com
 ads.casinocity.com
 ads.casumoaffiliates.com
@@ -3179,6 +3180,7 @@ ajjhtetv87.com
 ajjnsnwchenglwf.com
 ajkelra.com
 ajkzd9h.com
+ajoqysuc.xyz
 ajrequestion.xyz
 ajwssds.com
 ak.imgaft.com
@@ -3624,6 +3626,7 @@ apps.media-lab.ai
 appsflyer.com
 appstreamsb.xyz
 appstreets.com
+apptdvibrate.com
 appwebview.com
 aprick.xyz
 apromoweb.com
@@ -4964,6 +4967,7 @@ bjhengdiao.com
 bjhmdy.vip
 bjhuhangjy.com
 bjjdboai.cn
+bjjkmxrwvba.com
 bjmantis.net
 bjmxcy.cn
 bjornecoydog.com
@@ -4996,6 +5000,7 @@ bl0uxepb4o.com
 bl2030.com
 bla01.com
 blabhorol.com
+blacil.com
 blackbar.cn
 blackcurrantfootballsimilarly.com
 blackforce.club
@@ -7131,6 +7136,7 @@ cuhzsx.xyz
 cuilongsp.cn
 cuisineenvoyadvertise.com
 cuit.shop
+cuivdfqvod.top
 culmedmaumee.com
 culpritwatchmanhostile.com
 culreelt.com
@@ -8321,6 +8327,7 @@ doashair.net
 doboacki.net
 dockdigestion.com
 docksalmon.com
+docsrmmeil.com
 dodgiercuvy.cam
 dodolive.cn
 dogcollarfavourbluff.com
@@ -8467,6 +8474,7 @@ dqulcczd.com
 dr3k6qonw2kee.cloudfront.net
 dr8pk6ovub897.cloudfront.net
 drabsize.com
+draggedindicationconsiderable.com
 dragoncent.com
 dragonsniffcashmere.com
 dragzebra.com
@@ -8594,6 +8602,7 @@ dukirliaon.com
 dulillipupan.com
 dulombwwfm.com
 duluoweiyu.com
+dumbclerkwow.com
 dumbpop.com
 dummyreopentypes.com
 dumpersgoofed.com
@@ -9082,6 +9091,7 @@ emjs.mkzhan.com
 emkarto.fun
 emlifok.info
 emltrk.com
+emmermyotic.com
 emodoinc.com
 emolah.com
 emolapnay.com
@@ -10631,7 +10641,6 @@ gertesaevided.xyz
 geruksom.net
 gerunsenbo.cn
 geryi.com
-get-best-prizes.life
 get-me-wow.xyz
 get.cryptobrowser.site
 get.davincisgold.com
@@ -11132,6 +11141,7 @@ gremsaup.net
 grenatorkovsh.site
 grensauy.com
 grergoch.net
+gresic.com
 gresokie.com
 greyinstrument.com
 greystripe.com
@@ -12280,6 +12290,7 @@ hy.huangye88.com.cn
 hy.huangye88.net
 hybgrhjuk.xyz
 hycfxdc.com
+hycikesty.pro
 hycra.cn
 hydragrouge.com
 hydramedia.com
@@ -12370,6 +12381,7 @@ iadnet.com
 iadqqgpjno.com
 iads.xinmin.cn
 iagc.com.cn
+iahjoni.cn
 iahkvlqmahoide.com
 iamtheid.club
 ianstarvard.co
@@ -13483,6 +13495,7 @@ jrpkizae.com
 jrrxbz.net
 js*.abolezi.com
 js-agent.newrelic.com
+js-tianqilm.com
 js.23yy.com
 js.263y.com
 js.9136.com
@@ -13726,6 +13739,7 @@ k.iinfo.cz
 k1.dancihu.com
 k1.wanwenwan.cn
 k1815.com
+k1rsdhu.xyz
 k2215.cn
 k22x6.cn
 k5p8f2.cn
@@ -13798,6 +13812,7 @@ kazoowaughy.com
 kazucivi.com
 kbdviyqhbhnd.com
 kbkilog.cn
+kbneks00.online
 kbngab.com
 kbnihnmrghgy.com
 kbotrjug.xyz
@@ -14145,6 +14160,7 @@ kuaipaobiaoju.com
 kuaishang.com.cn
 kuaiyunbd.com
 kuajingtao.cc
+kuamei.cloud
 kuangbang.ltd
 kubicserves.icu
 kubient.com
@@ -14358,6 +14374,7 @@ lbts.ltd
 lbwcdnjpy.com
 lbwikabrfkcmd.xyz
 lc442.com
+lccnkspairqeem.com
 lcdnw.com
 lcdwjuzdkpxnss.com
 lcentntel.com
@@ -14512,6 +14529,7 @@ lgpumcja.com
 lgse.com
 lgsmartad.com
 lgygy.cn
+lhacgsdvkrm.com
 lhafy.com
 lhbdpnhdjcxtr.xyz
 lhcqbim.cn
@@ -14882,6 +14900,7 @@ looprapid.com
 loopredsglen.com
 lootynews.com
 loout.top
+lop.com
 lophaszip.com
 loptyinterva.xyz
 lopzitpup.com
@@ -15356,7 +15375,6 @@ matomo.activate.cz
 matomo.crossiety.app
 matomo.gals24.ru
 matomo.hdweb.ru
-matomo.kmkb.ru
 matomo.zwetok.ru
 matrimonyfiles.com
 matswhyask.cam
@@ -15667,6 +15685,7 @@ mgwcn.com
 mgzs.cdn.bcebos.com
 mgzupozfeltrv.com
 mh9dskj8jg.com
+mhdjkx.cn
 mhdnspro.com
 mhebbkfyhsu.com
 mhi9da.cn
@@ -16358,6 +16377,7 @@ napesropes.com
 nappyattack.com
 nappybedcandid.com
 naptaush.com
+naqsadv.cn
 naradxb.com
 narkalignevil.com
 narrowperennialaffable.com
@@ -17471,6 +17491,7 @@ oq68.com
 oqbktsug.xyz
 oqhedrmfet.com
 oqqtvgm.cn
+oqsujyxbsl.xyz
 oqurycnm.top
 oqwhzgimuvxpd.com
 oranegfodnd.com
@@ -18998,6 +19019,7 @@ pubtm.com
 pubwes.com
 puddingreluctantly.com
 puddlebooty.com
+puddrupose.com
 pudrardu.net
 pufagobs.com
 puffyloss.com
@@ -19284,6 +19306,7 @@ qibalmm.com
 qibxdwe1.com
 qichenx.com
 qichetuoyun.com.cn
+qicqn.cn
 qiditrade.com
 qifake.com
 qiguoguo.net
@@ -19330,6 +19353,7 @@ qksrv.net
 qksz.net
 qktbbiavkqcqmn.com
 qktfwkftgqeynnp.com
+qkuvmwf.cn
 ql.tc
 ql.uzuzuz.com
 qlmqzznfcb.com
@@ -19453,6 +19477,7 @@ quehq.com
 quenchskirmishcohere.com
 quensillo.com
 querylead.com
+questaffiliates.net
 questionmarket.com
 questionsadjournasleep.com
 questionsunpleasantaborigines.com
@@ -21058,6 +21083,7 @@ shengchaopiao.cn
 shengdaoyiliao.com
 shengminsy.com
 shengshipump.cn
+shengtaiyuan.mobi
 shengyaxd.com
 shenhao258.top
 shenhl.top
@@ -21153,6 +21179,7 @@ showmebars.com
 shproud.com
 shqbsdjatunl.com
 shrillbeatintimidating.com
+shrillbighearted.com
 shrillspoon.com
 shrimpsqueezed.com
 shrtswkj.com
@@ -21162,6 +21189,7 @@ shsdw.cn
 shsnjj.top
 shsswdrhs.com
 shtiesen.cn
+shtu.shop
 shua66.vip
 shuai.love
 shuaiqiwudixiaoliangzaidddd.icu
@@ -21212,6 +21240,7 @@ sidebyz.com
 sidelinesibilant.com
 sidewaybeings.com
 sielsmaats.com
+sienddqncn.xyz
 sieveinterposed.com
 siflpwdfjimwig.top
 sifuglie.com
@@ -22515,6 +22544,7 @@ tartoals.net
 tarvemowhay.com
 tastefulsongs.com
 tastesmodifycount.com
+tastierxyphoid.com
 tastingraise.com
 tatdunsit.com
 tateuniver.club
@@ -22917,6 +22947,7 @@ tinbuadserv.com
 tingeffukec.one
 tingfengyu.top
 tinglian.com
+tingsec.link
 tingthenee.biz
 tingyusw.xyz
 tinkerta.com
@@ -24269,6 +24300,7 @@ vffvtxcykog.com
 vfghc.com
 vfl81ea28aztw7y3.pro
 vfmfjoknzndbee.com
+vfswvhbxwclm.com
 vfvdsati.com
 vgfutxwgq.com
 vggdaiesp.com
@@ -25198,6 +25230,8 @@ wlmarketing.com
 wlmhdk.cn
 wlnrofikppw.xyz
 wlshotel.cn
+wltqfaeeiexixp.com
+wltqfaeeiexixp.top
 wlwblog.top
 wlxzzx.cn
 wlzohrpjbuq.com
@@ -25641,6 +25675,7 @@ xhct66.com
 xhera.cn
 xhfrt.cn
 xhfya.cn
+xhhy.online
 xhmopymez.com
 xhmrv.com
 xhmybanjia.cn
@@ -25721,6 +25756,7 @@ xingsky.cn
 xingtu.ltd
 xingxingdd.com
 xingxingdm.com
+xingyou22.xyz
 xingyou25.xyz
 xingyou46.icu
 xingzhu.top
@@ -25951,6 +25987,7 @@ xwhtnxakjqrtf.com
 xwintop.top
 xwktyiydn.com
 xwkxpxili.com
+xwoqjitfpcxkqf.xyz
 xww360.com
 xwxmfubxzc.com
 xx123.top
@@ -26270,6 +26307,7 @@ ykanx.com
 ykbeeweifodyyb.com
 ykcoijcfpzda.com
 ykpbgqc.top
+ykqkxiqwlkqeg.top
 ykrssqaufg.com
 yktj.yzz.cn
 ykwh.store
@@ -26426,6 +26464,7 @@ yrrsckr.cn
 yrzdbzq.cn
 ys.muhoujiemi.com
 ys2000.cdn.bcebos.com
+ys2727.xyz
 ysclub.top
 ysczggasfx.com
 ysdtcdnoox.com
diff --git a/mosdns/Makefile b/mosdns/Makefile
index d998bb3d8..1ade9251b 100644
--- a/mosdns/Makefile
+++ b/mosdns/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosdns
-PKG_VERSION:=46757fc
+PKG_VERSION:=d0c24da
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz