update-02.18

luci-app-advanced/Makefile

@@ -1,17 +1,43 @@
 # Copyright (C) 2019  sirpdboy <https://github.com/sirpdboy/luci-app-advanced/>
 # 
+#
+#
 # This is free software, licensed under the Apache License, Version 2.0 .
 # 
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
-LUCI_TITLE:=LuCI Support for advanced and filebrowser
+PKG_NAME:=luci-app-advanced
-PKG_VERSION:=1.9
+PKG_VERSION:=1.20
-
+PKG_RELEASE:=20220218
-define Package/luci-app-advanced/conffiles
+define Package/$(PKG_NAME)
-/etc/config/advanced
+  SECTION:=luci
+  CATEGORY:=LuCI
+  SUBMENU:=3. Applications
+  DEPENDS:=
+   TITLE:=LuCI Support for advanced and filebrowser
+   PKGARCH:=all
 endef
 
-include $(TOPDIR)/feeds/luci/luci.mk
+define Build/Compile
+endef
 
-# call BuildPackage - OpenWrt buildroot signature
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci
+	$(CP) ./luasrc/* $(1)/usr/lib/lua/luci
+	
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./root/etc/config/advanced $(1)/etc/config/
+	
+	$(INSTALL_DIR) $(1)/www
+	cp -pR ./htdocs/* $(1)/www/
+	
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults/
+	
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) ./root/bin/* $(1)/bin/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

luci-app-advanced/luasrc/model/cbi/advanced.lua

@@ -1,9 +1,66 @@
 local e=require"nixio.fs"
 local t=require"luci.sys"
+local t=luci.model.uci.cursor()
 m=Map("advanced",translate("高级进阶设置"),translate("<font color=\"Red\"><strong>配置文档是直接编辑的除非你知道自己在干什么，否则请不要轻易修改这些配置文档。配置不正确可能会导致不能开机等错误。</strong></font><br/>"))
 m.apply_on_parse=true
 s=m:section(TypedSection,"advanced")
 s.anonymous=true
+
+if nixio.fs.access("/bin/nuc")then
+  s:tab("mode",translate("模式设置"),translate("<br />可以在这里切换旁路由和正常模式，重置你的网络设置。<br /><font color=\"Red\"><strong>点击后会立即重启设备，没有确认过程，请谨慎操作！</strong></font><br/>"))
+  o=s:taboption("mode",Button,"nucmode",translate("切换为旁路由模式"),translate("<font color=\"green\"><strong>本模式适合于单口和多网口主机，自动将网口全桥接好！<br />默认gateway是：192.168.1.1，ipaddr是192.168.1.2。用本机接口LAN接上级LAN当旁路由，主路由关闭DHCP服务。应用生效会重启软路由！</strong></font><br/>"))
+  o.inputtitle = translate("Apply")
+  o.inputstyle = "reset"
+  o.write = function()
+    luci.sys.exec("/bin/nuc &> /dev/null &")
+  end
+  o=s:taboption("mode",Button,"normalmode",translate("切换成路由模式"),translate("<font color=\"green\"><strong>本模式适合于有两个网口或以上的设备使用，如多网口软路由或者虚拟了两个以上网口的虚拟机使用！应用生效会重启软路由！。</strong></font><br/>"))
+  o.inputtitle = translate("Apply")
+  o.inputstyle = "reset"
+  o.write = function()
+   luci.sys.exec("/bin/normalmode &> /dev/null &")
+  end
+
+	o=s:taboption("mode",Button,"ipmode6",translate("设置为IPV6网络"),translate("<font color=\"green\"><strong>点击应用切换到IPV6模式！保存应用后即刻有效！</strong></font><br/>"))
+
+	o.inputtitle = translate("Apply")
+	o.inputstyle = "add"
+	o.write = function(self, section)
+  		luci.sys.exec("ipmode6  &> /dev/null &")
+	end
+
+	o=s:taboption("mode",Button,"ipmode4",translate("设置为IPV4网络"),translate("<font color=\"green\"><strong>点击应用切换到IPV4模式！保存应用后即刻有效！</strong></font><br/>"))
+
+	o.inputtitle = translate("Apply")
+	o.inputstyle = "add"
+	o.write = function(self, section)
+  		luci.sys.exec("ipmode4  &> /dev/null &")
+	end
+
+end
+if nixio.fs.access("/etc/dnsmasq.conf")then
+
+s:tab("dnsmasqconf",translate("dnsmasq"),translate("本页是配置/etc/dnsmasq.conf的文档内容。应用保存后自动重启生效"))
+
+conf=s:taboption("dnsmasqconf",Value,"dnsmasqconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+conf.template="cbi/tvalue"
+conf.rows=20
+conf.wrap="off"
+conf.cfgvalue=function(t,t)
+return e.readfile("/etc/dnsmasq.conf")or""
+end
+conf.write=function(a,a,t)
+if t then
+t=t:gsub("\r\n?","\n")
+e.writefile("/tmp/dnsmasq.conf",t)
+if(luci.sys.call("cmp -s /tmp/dnsmasq.conf /etc/dnsmasq.conf")==1)then
+e.writefile("/etc/dnsmasq.conf",t)
+luci.sys.call("/etc/init.d/dnsmasq restart >/dev/null")
+end
+e.remove("/tmp/dnsmasq.conf")
+end
+end
+end
 if nixio.fs.access("/etc/config/network")then
 s:tab("netwrokconf",translate("网络"),translate("本页是配置/etc/config/network包含网络配置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("netwrokconf",Value,"netwrokconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -25,6 +82,51 @@ e.remove("/tmp/network")
 end
 end
 end
+if nixio.fs.access("/etc/config/wireless")then
+s:tab("wirelessconf",translate("无线"), translate("本页是/etc/config/wireless的配置文件内容，应用保存后自动重启生效."))
+
+conf=s:taboption("wirelessconf",Value,"wirelessconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+conf.template="cbi/tvalue"
+conf.rows=20
+conf.wrap="off"
+conf.cfgvalue=function(t,t)
+return e.readfile("/etc/config/wireless")or""
+end
+conf.write=function(a,a,t)
+if t then
+t=t:gsub("\r\n?","\n")
+e.writefile("/etc/config/wireless.tmp",t)
+if(luci.sys.call("cmp -s /etc/config/wireless.tmp /etc/config/wireless")==1)then
+e.writefile("/etc/config/wireless",t)
+luci.sys.call("wifi reload >/dev/null &")
+end
+e.remove("/tmp//tmp/wireless.tmp")
+end
+end
+end
+
+if nixio.fs.access("/etc/hosts")then
+s:tab("hostsconf",translate("hosts"),translate("本页是配置/etc/hosts的文档内容。应用保存后自动重启生效"))
+
+conf=s:taboption("hostsconf",Value,"hostsconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+conf.template="cbi/tvalue"
+conf.rows=20
+conf.wrap="off"
+conf.cfgvalue=function(t,t)
+return e.readfile("/etc/hosts")or""
+end
+conf.write=function(a,a,t)
+if t then
+t=t:gsub("\r\n?","\n")
+e.writefile("/tmp/hosts.tmp",t)
+if(luci.sys.call("cmp -s /tmp/hosts.tmp /etc/hosts")==1)then
+e.writefile("/etc/hosts",t)
+luci.sys.call("/etc/init.d/dnsmasq restart >/dev/null")
+end
+e.remove("/tmp/hosts.tmp")
+end
+end
+end
 if nixio.fs.access("/etc/config/arpbind")then
 s:tab("arpbindconf",translate("ARP绑定"),translate("本页是配置/etc/config/arpbind包含APR绑定MAC地址文档内容。应用保存后自动重启生效"))
 conf=s:taboption("arpbindconf",Value,"arpbindconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -195,27 +297,6 @@ end
 end
 end
 
-if nixio.fs.access("/etc/config/ksmbd")then
-s:tab("ksmbdconf",translate("网络共享"),translate("本页是配置/etc/config/ksmbd包含网络唤醒配置文档内容。应用保存后自动重启生效"))
-conf=s:taboption("ksmbdconf",Value,"ksmbdconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
-conf.template="cbi/tvalue"
-conf.rows=20
-conf.wrap="off"
-conf.cfgvalue=function(t,t)
-return e.readfile("/etc/config/ksmbd")or""
-end
-conf.write=function(a,a,t)
-if t then
-t=t:gsub("\r\n?","\n")
-e.writefile("/tmp/ksmbd",t)
-if(luci.sys.call("cmp -s /tmp/ksmbd/etc/config/ksmbd")==1)then
-e.writefile("/etc/config/ksmbd",t)
-luci.sys.call("/etc/init.d/ksmbd restart >/dev/null")
-end
-e.remove("/tmp/ksmbd")
-end
-end
-end
 if nixio.fs.access("/etc/config/smartdns")then
 s:tab("smartdnsconf",translate("SMARTDNS"),translate("本页是配置/etc/config/smartdns包含smartdns配置文档内容。应用保存后自动重启生效"))
 conf=s:taboption("smartdnsconf",Value,"smartdnsconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
@@ -237,4 +318,27 @@ e.remove("/tmp/smartdns")
 end
 end
 end
+if nixio.fs.access("/etc/config/openclash")then
+s:tab("openclashconf",translate("openclash"),translate("本页是配置/etc/config/openclash的文档内容。应用保存后自动重启生效"))
+conf=s:taboption("openclashconf",Value,"openclashconf",nil,translate("开头的数字符号（＃）或分号的每一行（;）被视为注释；删除（;）启用指定选项。"))
+conf.template="cbi/tvalue"
+conf.rows=20
+conf.wrap="off"
+conf.cfgvalue=function(t,t)
+return e.readfile("/etc/config/openclash")or""
+end
+conf.write=function(a,a,t)
+if t then
+t=t:gsub("\r\n?","\n")
+e.writefile("/tmp/openclash",t)
+if(luci.sys.call("cmp -s /tmp/openclash /etc/config/openclash")==1)then
+e.writefile("/etc/config/openclash",t)
+luci.sys.call("/etc/init.d/openclash restart >/dev/null")
+end
+e.remove("/tmp/openclash")
+end
+end
+end
+
+
 return m

luci-app-advanced/root/bin/ipmode4

@@ -0,0 +1,26 @@
+#!/bin/sh
+uci set network.@globals[0].ula_prefix=''
+uci set network.lan.delegate='0'
+uci set network.wan.mtu=1460
+uci set network.wan.metric='41'
+uci set network.wan.delegate='0'
+uci set network.wan.ipv6='0'
+uci commit network
+uci set dhcp.@dnsmasq[0].cachesize='15000'
+uci set dhcp.@dnsmasq[0].min_ttl='3600'
+uci set dhcp.@dnsmasq[0].filter_aaaa='1'
+uci set dhcp.@dnsmasq[0].localservice='0'
+uci set dhcp.@dnsmasq[0].nonwildcard='0'
+uci set dhcp.@dnsmasq[0].rebind_protection='0'
+uci set dhcp.@dnsmasq[0].noresolv='0'
+uci set dhcp.lan.ra=''
+uci set dhcp.lan.ndp=''
+uci set dhcp.lan.dhcpv6=''
+uci set dhcp.lan.ignore='0'
+uci set dhcp.lan.ra_management='1'
+uci set dhcp.lan.ra_default='1'
+uci set dhcp.lan.force='1'
+uci commit dhcp
+sed -i "/list server/d" /etc/config/dhcp
+/etc/init.d/network restart
+/etc/init.d/dnsmasq restart

luci-app-advanced/root/bin/ipmode6

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+uci set dhcp.@dnsmasq[0].cachesize='15000'
+uci set dhcp.@dnsmasq[0].min_ttl='3600'
+uci set dhcp.@dnsmasq[0].filter_aaaa='0'
+uci set dhcp.@dnsmasq[0].localservice='0'
+uci set dhcp.@dnsmasq[0].nonwildcard='0'
+uci set dhcp.@dnsmasq[0].rebind_protection='0'
+uci set dhcp.@dnsmasq[0].noresolv='1'
+uci set dhcp.lan.ra='server'
+uci set dhcp.lan.ndp=''
+uci set dhcp.lan.dhcpv6=''
+uci set dhcp.lan.ignore='0'
+uci set dhcp.lan.ra_management='1'
+uci set dhcp.lan.ra_default='1'
+uci set dhcp.lan.force='1'
+uci commit dhcp
+uci set network.@globals[0].ula_prefix=''
+uci set network.lan.delegate='0'
+uci set network.wan.mtu=1460
+uci set network.wan.metric='41'
+uci set network.wan.delegate='0'
+uci set network.wan.ipv6='auto'
+uci commit network
+sed -i "/list server/d" /etc/config/dhcp
+/etc/init.d/network restart
+/etc/init.d/dnsmasq restart

luci-app-advanced/root/bin/normalmode

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+uci set system.@system[0].hostname="Openwrt"
+uci commit
+
+cat > /etc/config/network <<EOF
+config interface 'loopback'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'lan'
+	option type 'bridge'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ifname 'eth0 eth2 eth3'
+
+config interface 'wan'
+	option ifname 'eth1'
+	option proto 'dhcp'
+	option hostname 'Openwrt'
+EOF
+
+sed -i '/REDIRECT --to-ports 53/d' /etc/firewall.user
+sed -i '/MASQUERADE/d' /etc/firewall.user
+echo "iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53" >> /etc/firewall.user
+echo "iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53" >> /etc/firewall.user
+reboot

luci-app-advanced/root/bin/nuc

@@ -0,0 +1,80 @@
+#!/bin/sh
+ip=/usr/sbin/ip
+vconfig=/sbin/vconfig
+ifconfig=/sbin/ifconfig
+
+uci set system.@system[0].hostname="Openwrt"
+uci commit
+cat > /etc/config/network <<EOF
+config interface 'loopback'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'lan'
+	option type 'bridge'
+	option ifname 'eth0 eth1 eth2 eth3 eth4 eth5 eth0.12 eth0.13 eth0.14 eth0.15 eth0.16 eth0.17 eth0.18'
+	option proto 'static'
+	option ipaddr '192.168.1.2'
+	option netmask '255.255.255.0'
+	option gateway '192.168.1.1'
+	option dns '223.5.5.5'
+
+config interface 'wan'
+	option ifname 'eth0.11'
+	option proto 'dhcp'
+	option hostname 'Openwrt'
+EOF
+
+#for eth1
+$ip link add link eth0 eth0.11 type vlan proto 802.1ad id 11
+$ifconfig eth0.11 hw ether 58:b0:35:86:cf:11
+$vconfig set_flag eth0.11 1 1
+$ifconfig eth0.11 up
+
+#for eth2
+$ip link add link eth0 eth0.12 type vlan proto 802.1ad id 12
+$ifconfig eth0.12 hw ether 58:b0:35:86:cf:12
+$vconfig set_flag eth0.12 1 2
+$ifconfig eth0.12 up
+
+#for eth3
+$ip link add link eth0 eth0.13 type vlan proto 802.1ad id 13
+$ifconfig eth0.13 hw ether 58:b0:35:86:cf:13
+$vconfig set_flag eth0.13 1 3
+$ifconfig eth0.13 up
+
+#for eth4
+$ip link add link eth0 eth0.14 type vlan proto 802.1ad id 14
+$ifconfig eth0.14 hw ether 58:b0:35:86:cf:14
+$vconfig set_flag eth0.14 1 3
+$ifconfig eth0.14 up
+
+#for eth5
+$ip link add link eth0 eth0.15 type vlan proto 802.1ad id 15
+$ifconfig eth0.15 hw ether 58:b0:35:86:cf:15
+$vconfig set_flag eth0.15 1 3
+$ifconfig eth0.15 up
+
+#for eth6
+$ip link add link eth0 eth0.16 type vlan proto 802.1ad id 16
+$ifconfig eth0.16 hw ether 58:b0:35:86:cf:16
+$vconfig set_flag eth0.16 1 3
+$ifconfig eth0.16 up
+
+#for eth7
+$ip link add link eth0 eth0.17 type vlan proto 802.1ad id 17
+$ifconfig eth0.17 hw ether 58:b0:35:86:cf:17
+$vconfig set_flag eth0.17 1 3
+$ifconfig eth0.17 up
+
+#for eth8
+$ip link add link eth0 eth0.18 type vlan proto 802.1ad id 18
+$ifconfig eth0.18 hw ether 58:b0:35:86:cf:18
+$vconfig set_flag eth0.18 1 3
+$ifconfig eth0.18 up
+
+sed -i '/MASQUERADE/d' /etc/firewall.user
+echo "iptables -t nat -I POSTROUTING -j MASQUERADE" >> /etc/firewall.user
+reboot

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

@@ -53,11 +53,10 @@ reload_service() {
 }
 
 setcron() {
-	[ "$(tail -n1 /etc/crontabs/root | wc -l)" -eq 0 ] && [ -n "$(cat /etc/crontabs/root 2>/dev/null)" ] && echo >>/etc/crontabs/root
+	sed -i '/mosupdater.sh/d' $CRON_FILE 2>/dev/null && {
-	grep -q "mosupdater.sh" "$CRON_FILE" && {
 		[ "$(uci -q get mosdns.mosdns.geo_auto_update)" -eq 1 ] && echo "0 $(uci -q get mosdns.mosdns.geo_update_day_time) * * $(uci -q get mosdns.mosdns.geo_update_week_time) /etc/mosdns/mosupdater.sh" >>$CRON_FILE
 	}
-	crontab $CRON_FILE
+	/etc/init.d/cron restart
 }
 
 delcron() {

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

@@ -580,6 +580,7 @@
 3c76eee2407c7c1.com
 3ca28642b714623b2.com
 3d9obb7.cn
+3dk.tech
 3dqiang.com
 3dshoppingwall.com
 3e787c93af8de.com
@@ -939,6 +940,7 @@
 778669.com
 7791.com.cn
 77f24529d8427410.com
+77nnv9.xyz
 77power.com
 77tracking.com
 7839e0482307b9276b.com
@@ -957,6 +959,7 @@
 7c0210y.cn
 7c0616849b.com
 7c1e55606540.com
+7ca78m3csgbrid7ge.com
 7caidai.xyz
 7car.com.cn
 7cbwus.cn
@@ -3188,6 +3191,7 @@ alcaidloggers.com
 alchemist.go2cloud.org
 alchemysocial.com
 alclick.com
+alcoated.com
 alcoholicsort.com
 alcreasalcon.info
 alcroconawa.com
@@ -3798,6 +3802,7 @@ aswfs.xyz
 aswpapius.com
 aswpsdkus.com
 asxemfnwbrmpdp.com
+asxoseeetdclha.xyz
 asxvawth.com
 at*.doubanio.com
 at-adserver.alltop.com
@@ -4746,6 +4751,7 @@ bestregarsv.fun
 bestrevenuenetwork.com
 bestsearch.net
 bestssn.com
+bestwinterclck.name
 bestzba.com
 beta-news.org
 betahit.click
@@ -5412,6 +5418,7 @@ bulletfeedspy.com
 bulletprofitads.com
 bulletprofitpop.com
 bullionyield.com
+bulrev.com
 bumblecash.com
 bummershindigeavesdropping.com
 buncoswosh.com
@@ -7875,6 +7882,7 @@ dev.visualwebsiteoptimizer.com
 devaluationlimetreedeadly.com
 devaluationobserve.com
 devastatingallothallucinate.com
+developingmansensitiveness.com
 develsdrawal.xyz
 devilspanmute.com
 deviouscoupbrutally.com
@@ -7903,6 +7911,7 @@ dfjbgfldsjdsnldksjalld1235.cn
 dfmngtubtdfxnq.com
 dfseafood.com
 dftvhvapqxs.xyz
+dfxofvzd.com
 dgafgadsgkjg.top
 dgaoz.com
 dgbaozhuang.cn
@@ -8279,6 +8288,7 @@ domnlk.com
 domparce.pro
 domslc.com
 donecooler.com
+donemillio.com
 donescaffold.com
 dongdm.cn
 donghua.asia
@@ -9251,6 +9261,7 @@ etrecantformation.com
 etrht.cn
 etruet.com
 ettilt.com
+etuluoxx.top
 etwxjufiijhk.com
 etzxnqfew.com
 eu-adcenter.net
@@ -9562,6 +9573,7 @@ fastdld.com
 fastdln.com
 fastdlr.com
 fastenpaganhelm.com
+faster-trk.com
 fastestvolcano.com
 fastly-insights.com
 fastpopclick.com
@@ -10159,6 +10171,7 @@ fthkmwrkqg.com
 ftjcfx.com
 ftklr.com
 ftliokfhtyijhl.com
+ftte.fun
 fttwin.icu
 ftv-publicite.fr
 ftvqvv.cn
@@ -10632,6 +10645,7 @@ gilutt.com
 gimpybedderump.com
 ginningsteri.com
 giotlsi.cn
+girdlespittle.com
 girlend.com
 girli.top
 girnedsline.cam
@@ -11144,6 +11158,7 @@ guideserv.cn
 guigankj.cn
 guirui-clothes.com
 guiyimq.fun
+guji.store
 gukmoduk.one
 gulpduereason.com
 gumbolersgthb.com
@@ -11515,6 +11530,7 @@ heathertravelledpast.com
 heavenlygenetically.com
 heavenwil.top
 hebadu.com
+hebcpjvghsctfn.com
 hebeixingfei.com
 hebeiyichen.com
 hebhec.cn
@@ -13411,6 +13427,7 @@ judaisydfs.club
 judgeclaimsmaiden.com
 judgementinvincible.com
 judicated.com
+judicialwisdomdisadvantage.com
 judjetheminos.com
 juechenghuanbao.top
 jufengputao.com
@@ -13628,6 +13645,7 @@ katatalkenna.com
 katecrochetvanity.com
 katelin.top
 katerigordas.pro
+katie.v4.byetnc.com
 katoptristhemirr.com
 katurars.com
 kaubapsy.com
@@ -14119,6 +14137,7 @@ landlordmanoeuvre.com
 landscapeuproar.com
 landslidechoreloft.com
 langchars.com
+langger76.site
 lanistaads.com
 lankychaosrun.com
 lanshi021.com
@@ -14255,6 +14274,7 @@ leftliquid.com
 leftoverdense.com
 leftoverdoorbell.com
 lefxryhuzyw.com
+lega.store
 legalevaluate.com
 legalledgtjuj.club
 legcatastrophetransmitted.com
@@ -14619,6 +14639,7 @@ lntyjjh.org.cn
 lnwejgghmtrqdka.xyz
 lnwhh.com
 lnwinopinion.click
+lo83cs.space
 loadercdn.com
 loading-resource.com
 loading321.com
@@ -16017,6 +16038,7 @@ muyijia.shop
 muyoozrkkyr.com
 muzzlelacking.com
 mv3kosrrlxa7.com
+mvdkcfyhtsq.com
 mvgueuevfbw.xyz
 mvlkvth.cn
 mvlqhielqnsdmy.com
@@ -16117,6 +16139,7 @@ mzokqm.cn
 mzol7lbm.com
 mzwfu.xyz
 mzwfw.club
+mzy1.xyz
 mzya5718.xyz
 n.baminw.com.cn
 n12qga4ld3zk.com
@@ -16135,6 +16158,7 @@ nacief.com
 nacontent.pro
 nads.io
 naemailom.fun
+nafulltiuk.com
 nagaglugry.com
 naganoadigei.com
 naggingrugcolossal.com
@@ -16145,6 +16169,7 @@ nailowhe.net
 nailsimproved.com
 nainaimi.top
 naj.sk
+naj22.proasdf.com
 najingyi.cn
 najsdnkdqpsd.com
 nakedfulfilhairy.com
@@ -17191,6 +17216,7 @@ oorunsey.com
 ootchoft.com
 oowelamdgta.com
 ooxoatse.com
+ooykew.cn
 opads.us
 opapxq.com
 opawyzoh.xyz
@@ -19215,6 +19241,7 @@ quantcount.com
 quantical.xyz
 quantserve.com
 quantummetric.com
+quanwu.shop
 quanxiaozi.com
 quarterbean.com
 quarterserver.de
@@ -19385,6 +19412,7 @@ raisingnegligencemanages.com
 raivikod.net
 rakamu.com
 ralijqugghwqil.com
+rallynabdoomed.com
 ramatering.club
 rampidads.com
 ramptariff.com
@@ -20097,6 +20125,7 @@ royalcactus.com
 rozamimo9za10.com
 rozivpxtl.com
 rpersonals.com
+rprinc6etodn9kunjiv.com
 rprygapywrk.com
 rptnwbxbl.com
 rpts.org
@@ -21546,6 +21575,7 @@ srtk.net
 srukdxvsk.com
 srv.dynamicyield.com
 srv.tunefindforfans.com
+srv224.com
 srvmath.com
 srvtrck.com
 srwiiu.cn
@@ -23435,6 +23465,7 @@ ucheephu.com
 ucjrmjilkdaudwj.xyz
 uctzcsooizikt.com
 ucxgg.com
+ud783c01.com
 ud783c02.com
 ud783c08.com
 ud831d2.com
@@ -23573,6 +23604,7 @@ underclick.ru
 underdividedhowever.com
 underdog.media
 underdorakely.com
+underminesprout.com
 underneathfirsthand.com
 underpantsbroadsheet.com
 underrewritepickles.com
@@ -23990,6 +24022,7 @@ vfl81ea28aztw7y3.pro
 vfmfjoknzndbee.com
 vfvdsati.com
 vgfutxwgq.com
+vggdaiesp.com
 vgimer.cn
 vgkknrbzwfau.com
 vgw35hwr4w6x.com
@@ -24243,6 +24276,7 @@ vpon.com
 vptbn.com
 vpyqdlrweoc.com
 vq7736.com
+vqlrwgj.cn
 vqr3jeu1qi41.com
 vr4011.com
 vr4021.com
@@ -24655,6 +24689,7 @@ wetpeachcash.com
 wetrack.it
 wew.dushiwenxue.net
 wewon.to
+wezathejy.pro
 wf321.com
 wfaffwshop.xyz
 wfawhfxe.com
@@ -25167,6 +25202,7 @@ wxwkgxnemw.xyz
 wxxfqc.com
 wxyn0o3xmora.com
 wxyun168.xyz
+wy8.wang
 wy95.xyz
 wyafelk.cn
 wydong.top
@@ -25500,6 +25536,7 @@ xmseaside.com
 xmstpay.com
 xmtsyg.com
 xmvusqpp.com
+xmwn.shop
 xmxxwl.com
 xmyejun.cn
 xmysinter.com
@@ -26046,6 +26083,7 @@ youlouk.com
 younct.com
 youngalsobeautiful.com
 youngerpoem.com
+youngestboyish.com
 youngestsow.com
 youngoutmatchthousand.com
 youpeng.pw

luci-app-netdata/root/etc/uci-defaults/40_luci-app-netdata

@@ -1,7 +1,7 @@
 #!/bin/sh
 [ -f /usr/share/netdata/webcn/dashboard.js ] && mv -f /usr/share/netdata/webcn/dashboard.js /usr/share/netdata/web/dashboard.js
 [ -f /usr/share/netdata/webcn/dashboard_info.js ] && mv -f /usr/share/netdata/webcn/dashboard_info.js /usr/share/netdata/web/dashboard_info.js
-[ -f /usr/share/netdata/webcn/main.js ] && mv -f /usr/share/netdata/webcn/dashboard.js /usr/share/netdata/web/main.js
+[ -f /usr/share/netdata/webcn/main.js ] && mv -f /usr/share/netdata/webcn/main.js /usr/share/netdata/web/main.js
 [ -f /usr/share/netdata/webcn/index.html ] && mv -f /usr/share/netdata/webcn/index.html /usr/share/netdata/web/index.html
 
 rm -rf /tmp/luci-modulecache /tmp/luci-indexcache*