diff --git a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua index 67a3ac0bf..0b925ade8 100644 --- a/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua +++ b/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua @@ -40,8 +40,8 @@ o.default = "info" o:depends("configfile", "/etc/mosdns/config.yaml") o = s:taboption("basic", Value, "logfile", translate("Log File")) -o.placeholder = "/tmp/mosdns.log" -o.default = "/tmp/mosdns.log" +o.placeholder = "/var/log/mosdns.log" +o.default = "/var/log/mosdns.log" o:depends("configfile", "/etc/mosdns/config.yaml") o = s:taboption("basic", Flag, "redirect", translate("DNS Forward"), translate("Forward Dnsmasq Domain Name resolution requests to MosDNS")) @@ -92,7 +92,7 @@ s:tab("advanced", translate("Advanced Options")) o = s:taboption("advanced", Value, "concurrent", translate("Concurrent"), translate("DNS query request concurrency, The number of upstream DNS servers that are allowed to initiate requests at the same time")) o.datatype = "and(uinteger,min(1),max(3))" -o.default = "1" +o.default = "2" o:depends("configfile", "/etc/mosdns/config.yaml") o = s:taboption("advanced", Value, "max_conns", translate("Maximum Connections"), translate("Set the Maximum connections for DoH and pipeline's TCP/DoT, Except for the HTTP/3 protocol")) diff --git a/luci-app-mosdns/po/zh-cn/mosdns.po b/luci-app-mosdns/po/zh-cn/mosdns.po index 944c9ff8f..762cd90bc 100644 --- a/luci-app-mosdns/po/zh-cn/mosdns.po +++ b/luci-app-mosdns/po/zh-cn/mosdns.po @@ -170,7 +170,7 @@ msgid "Remote DNS" msgstr "远程 DNS" msgid "Concurrent" -msgstr "DNS 服务器并发数（默认 1）" +msgstr "DNS 服务器并发数（默认 2）" msgid "DNS query request concurrency, The number of upstream DNS servers that are allowed to initiate requests at the same time" msgstr "DNS 查询请求并发数，允许同时发起请求的上游 DNS 服务器数量" diff --git a/luci-app-mosdns/root/etc/config/mosdns b/luci-app-mosdns/root/etc/config/mosdns index b49dd84a6..8de3b6c4b 100644 --- a/luci-app-mosdns/root/etc/config/mosdns +++ b/luci-app-mosdns/root/etc/config/mosdns @@ -9,7 +9,7 @@ config mosdns 'config' option adblock '0' option configfile '/etc/mosdns/config.yaml' option log_level 'info' - option logfile '/tmp/mosdns.log' + option logfile '/var/log/mosdns.log' option cache_size '8000' option cache_survival_time '86400' option dump_file '0' diff --git a/luci-app-mosdns/root/etc/init.d/mosdns b/luci-app-mosdns/root/etc/init.d/mosdns index d46d99cdb..8181141a3 100755 --- a/luci-app-mosdns/root/etc/init.d/mosdns +++ b/luci-app-mosdns/root/etc/init.d/mosdns @@ -45,7 +45,7 @@ get_config() { config_get geo_update_day_time $1 geo_update_day_time 2 config_get geo_update_week_time $1 geo_update_week_time "*" config_get listen_port $1 listen_port 5335 - config_get log_file $1 logfile "/tmp/mosdns.log" + config_get log_file $1 logfile "/var/log/mosdns.log" config_get log_level $1 log_level "info" config_get maximum_ttl_custom $1 maximum_ttl 0 config_get minimal_ttl_custom $1 minimal_ttl 0 diff --git a/luci-app-mosdns/root/etc/mosdns/config_custom.yaml b/luci-app-mosdns/root/etc/mosdns/config_custom.yaml index 3458d8950..15347bce3 100644 --- a/luci-app-mosdns/root/etc/mosdns/config_custom.yaml +++ b/luci-app-mosdns/root/etc/mosdns/config_custom.yaml @@ -1,6 +1,6 @@ log: level: info - file: "/tmp/mosdns.log" + file: "/var/log/mosdns.log" # API 入口设置 api: diff --git a/luci-app-mosdns/root/www/luci-static/resources/mosdns/lib/codemirror.css b/luci-app-mosdns/root/www/luci-static/resources/mosdns/lib/codemirror.css index d7eab7dee..504079b44 100644 --- a/luci-app-mosdns/root/www/luci-static/resources/mosdns/lib/codemirror.css +++ b/luci-app-mosdns/root/www/luci-static/resources/mosdns/lib/codemirror.css @@ -1 +1 @@ -.CodeMirror{/* Set height, width, borders, and global font properties here */ font-family: monospace; height: 500px; color: black; direction: ltr;}@media screen and (max-width: 768px){.CodeMirror{/* Set height, width, borders, and global font properties here */ font-size: small; font-family: monospace; height: 560px; width: 98%; color: black; direction: ltr;}}@media (min-width: 769px){.CodeMirror{/* Set height, width, borders, and global font properties here */ font-size: small; font-family: monospace; height: 560px; width: 750px; color: black; direction: ltr;}}.CodeMirror-lines{padding: 4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding: 0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color: white}.CodeMirror-gutters{border-right: 1px solid #ddd; background-color: #f7f7f7; white-space: nowrap}.CodeMirror-linenumber{padding: 0 3px 0 5px; min-width: 20px; text-align: right; color: #999; white-space: nowrap}.CodeMirror-guttermarker{color: black}.CodeMirror-guttermarker-subtle{color: #999}.CodeMirror-cursor{border-left: 1px solid black; border-right: 0; width: 0}.CodeMirror div.CodeMirror-secondarycursor{border-left: 1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width: auto; border: 0 !important; background: #7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index: 1}.cm-fat-cursor-mark{background-color: rgba(20, 255, 20, 0.5); -webkit-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite}.cm-animate-fat-cursor{width: auto; border: 0; -webkit-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite; background-color: #7e7}@-moz-keyframes blink{50%{background-color: transparent}}@-webkit-keyframes blink{50%{background-color: transparent}}@keyframes blink{50%{background-color: transparent}}.cm-tab{display: inline-block; text-decoration: inherit}.CodeMirror-rulers{position: absolute; left: 0; right: 0; top: -50px; bottom: 0; overflow: hidden}.CodeMirror-ruler{border-left: 1px solid #ccc; top: 0; bottom: 0; position: absolute}.cm-s-default .cm-header{color: blue}.cm-s-default .cm-quote{color: #090}.cm-negative{color: #d44}.cm-positive{color: #292}.cm-header,.cm-strong{font-weight: bold}.cm-em{font-style: italic}.cm-link{text-decoration: underline}.cm-strikethrough{text-decoration: line-through}.cm-s-default .cm-keyword{color: #708}.cm-s-default .cm-atom{color: #219}.cm-s-default .cm-number{color: #164}.cm-s-default .cm-def{color: #00f}.cm-s-default .cm-variable-2{color: #05a}.cm-s-default .cm-variable-3,.cm-s-default .cm-type{color: #085}.cm-s-default .cm-comment{color: #a50}.cm-s-default .cm-string{color: #a11}.cm-s-default .cm-string-2{color: #f50}.cm-s-default .cm-meta{color: #555}.cm-s-default .cm-qualifier{color: #555}.cm-s-default .cm-builtin{color: #30a}.cm-s-default .cm-bracket{color: #997}.cm-s-default .cm-tag{color: #170}.cm-s-default .cm-attribute{color: #00c}.cm-s-default .cm-hr{color: #999}.cm-s-default .cm-link{color: #00c}.cm-s-default .cm-error{color: red}.cm-invalidchar{color: red}.CodeMirror-composing{border-bottom: 2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color: #0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color: #a22}.CodeMirror-matchingtag{background: rgba(255, 150, 0, .3)}.CodeMirror-activeline-background{background: #e8f2ff}.CodeMirror{position: relative; overflow: hidden; background: white}.CodeMirror-scroll{overflow: scroll !important; margin-bottom: -30px; margin-right: -30px; padding-bottom: 30px; height: 100%; outline: 0; position: relative}.CodeMirror-sizer{position: relative; border-right: 30px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position: absolute; z-index: 6; display: none}.CodeMirror-vscrollbar{right: 0; top: 0; overflow-x: hidden; overflow-y: scroll}.CodeMirror-hscrollbar{bottom: 0; left: 0; overflow-y: hidden; overflow-x: scroll}.CodeMirror-scrollbar-filler{right: 0; bottom: 0}.CodeMirror-gutter-filler{left: 0; bottom: 0}.CodeMirror-gutters{position: absolute; left: 0; top: 0; min-height: 100%; z-index: 3}.CodeMirror-gutter{white-space: normal; height: 100%; display: inline-block; vertical-align: top; margin-bottom: -30px}.CodeMirror-gutter-wrapper{position: absolute; z-index: 4; background: none !important; border: none !important}.CodeMirror-gutter-background{position: absolute; top: 0; bottom: 0; z-index: 4}.CodeMirror-gutter-elt{position: absolute; cursor: default; z-index: 4}.CodeMirror-gutter-wrapper ::selection{background-color: transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color: transparent}.CodeMirror-lines{cursor: text; min-height: 1px}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; border-width: 0; background: transparent; font-family: inherit; font-size: inherit; margin: 0; white-space: pre; word-wrap: normal; line-height: inherit; color: inherit; z-index: 2; position: relative; overflow: visible; -webkit-tap-highlight-color: transparent; -webkit-font-variant-ligatures: contextual; font-variant-ligatures: contextual}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap: break-word; white-space: pre-wrap; word-break: normal}.CodeMirror-linebackground{position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: 0}.CodeMirror-linewidget{position: relative; z-index: 2; padding: .1px}.CodeMirror-rtl pre{direction: rtl}.CodeMirror-code{outline: 0}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing: content-box; box-sizing: content-box}.CodeMirror-measure{position: absolute; width: 100%; height: 0; overflow: hidden; visibility: hidden}.CodeMirror-cursor{position: absolute; pointer-events: none}.CodeMirror-measure pre{position: static}div.CodeMirror-cursors{visibility: hidden; position: relative; z-index: 3}div.CodeMirror-dragcursors{visibility: visible}.CodeMirror-focused div.CodeMirror-cursors{visibility: visible}.CodeMirror-selected{background: #d9d9d9}.CodeMirror-focused .CodeMirror-selected{background: #d7d4f0}.CodeMirror-crosshair{cursor: crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background: #d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background: #d7d4f0}.cm-searching{background-color: #ffa; background-color: rgba(255, 255, 0, .4)}.cm-force-border{padding-right: .1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility: hidden}}.cm-tab-wrap-hack:after{content: ''}span.CodeMirror-selectedtext{background: 0} \ No newline at end of file +.CodeMirror{/* Set height, width, borders, and global font properties here */ font-family: monospace; height: 500px; color: black; direction: ltr;}@media screen and (max-width: 768px){.CodeMirror{/* Set height, width, borders, and global font properties here */ font-size: small; font-family: monospace; height: 560px; width: 100%; color: black; direction: ltr;}}@media (min-width: 769px){.CodeMirror{/* Set height, width, borders, and global font properties here */ font-size: small; font-family: monospace; height: 560px; width: 750px; color: black; direction: ltr;}}.CodeMirror-lines{padding: 4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding: 0 4px}.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{background-color: white}.CodeMirror-gutters{border-right: 1px solid #ddd; background-color: #f7f7f7; white-space: nowrap}.CodeMirror-linenumber{padding: 0 3px 0 5px; min-width: 20px; text-align: right; color: #999; white-space: nowrap}.CodeMirror-guttermarker{color: black}.CodeMirror-guttermarker-subtle{color: #999}.CodeMirror-cursor{border-left: 1px solid black; border-right: 0; width: 0}.CodeMirror div.CodeMirror-secondarycursor{border-left: 1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width: auto; border: 0 !important; background: #7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index: 1}.cm-fat-cursor-mark{background-color: rgba(20, 255, 20, 0.5); -webkit-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite}.cm-animate-fat-cursor{width: auto; border: 0; -webkit-animation: blink 1.06s steps(1) infinite; -moz-animation: blink 1.06s steps(1) infinite; animation: blink 1.06s steps(1) infinite; background-color: #7e7}@-moz-keyframes blink{50%{background-color: transparent}}@-webkit-keyframes blink{50%{background-color: transparent}}@keyframes blink{50%{background-color: transparent}}.cm-tab{display: inline-block; text-decoration: inherit}.CodeMirror-rulers{position: absolute; left: 0; right: 0; top: -50px; bottom: 0; overflow: hidden}.CodeMirror-ruler{border-left: 1px solid #ccc; top: 0; bottom: 0; position: absolute}.cm-s-default .cm-header{color: blue}.cm-s-default .cm-quote{color: #090}.cm-negative{color: #d44}.cm-positive{color: #292}.cm-header,.cm-strong{font-weight: bold}.cm-em{font-style: italic}.cm-link{text-decoration: underline}.cm-strikethrough{text-decoration: line-through}.cm-s-default .cm-keyword{color: #708}.cm-s-default .cm-atom{color: #219}.cm-s-default .cm-number{color: #164}.cm-s-default .cm-def{color: #00f}.cm-s-default .cm-variable-2{color: #05a}.cm-s-default .cm-variable-3,.cm-s-default .cm-type{color: #085}.cm-s-default .cm-comment{color: #a50}.cm-s-default .cm-string{color: #a11}.cm-s-default .cm-string-2{color: #f50}.cm-s-default .cm-meta{color: #555}.cm-s-default .cm-qualifier{color: #555}.cm-s-default .cm-builtin{color: #30a}.cm-s-default .cm-bracket{color: #997}.cm-s-default .cm-tag{color: #170}.cm-s-default .cm-attribute{color: #00c}.cm-s-default .cm-hr{color: #999}.cm-s-default .cm-link{color: #00c}.cm-s-default .cm-error{color: red}.cm-invalidchar{color: red}.CodeMirror-composing{border-bottom: 2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color: #0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color: #a22}.CodeMirror-matchingtag{background: rgba(255, 150, 0, .3)}.CodeMirror-activeline-background{background: #e8f2ff}.CodeMirror{position: relative; overflow: hidden; background: white}.CodeMirror-scroll{overflow: scroll !important; margin-bottom: -30px; margin-right: -30px; padding-bottom: 30px; height: 100%; outline: 0; position: relative}.CodeMirror-sizer{position: relative; border-right: 30px solid transparent}.CodeMirror-vscrollbar,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-gutter-filler{position: absolute; z-index: 6; display: none}.CodeMirror-vscrollbar{right: 0; top: 0; overflow-x: hidden; overflow-y: scroll}.CodeMirror-hscrollbar{bottom: 0; left: 0; overflow-y: hidden; overflow-x: scroll}.CodeMirror-scrollbar-filler{right: 0; bottom: 0}.CodeMirror-gutter-filler{left: 0; bottom: 0}.CodeMirror-gutters{position: absolute; left: 0; top: 0; min-height: 100%; z-index: 3}.CodeMirror-gutter{white-space: normal; height: 100%; display: inline-block; vertical-align: top; margin-bottom: -30px}.CodeMirror-gutter-wrapper{position: absolute; z-index: 4; background: none !important; border: none !important}.CodeMirror-gutter-background{position: absolute; top: 0; bottom: 0; z-index: 4}.CodeMirror-gutter-elt{position: absolute; cursor: default; z-index: 4}.CodeMirror-gutter-wrapper ::selection{background-color: transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color: transparent}.CodeMirror-lines{cursor: text; min-height: 1px}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; border-width: 0; background: transparent; font-family: inherit; font-size: inherit; margin: 0; white-space: pre; word-wrap: normal; line-height: inherit; color: inherit; z-index: 2; position: relative; overflow: visible; -webkit-tap-highlight-color: transparent; -webkit-font-variant-ligatures: contextual; font-variant-ligatures: contextual}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap: break-word; white-space: pre-wrap; word-break: normal}.CodeMirror-linebackground{position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: 0}.CodeMirror-linewidget{position: relative; z-index: 2; padding: .1px}.CodeMirror-rtl pre{direction: rtl}.CodeMirror-code{outline: 0}.CodeMirror-scroll,.CodeMirror-sizer,.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber{-moz-box-sizing: content-box; box-sizing: content-box}.CodeMirror-measure{position: absolute; width: 100%; height: 0; overflow: hidden; visibility: hidden}.CodeMirror-cursor{position: absolute; pointer-events: none}.CodeMirror-measure pre{position: static}div.CodeMirror-cursors{visibility: hidden; position: relative; z-index: 3}div.CodeMirror-dragcursors{visibility: visible}.CodeMirror-focused div.CodeMirror-cursors{visibility: visible}.CodeMirror-selected{background: #d9d9d9}.CodeMirror-focused .CodeMirror-selected{background: #d7d4f0}.CodeMirror-crosshair{cursor: crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background: #d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background: #d7d4f0}.cm-searching{background-color: #ffa; background-color: rgba(255, 255, 0, .4)}.cm-force-border{padding-right: .1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility: hidden}}.cm-tab-wrap-hack:after{content: ''}span.CodeMirror-selectedtext{background: 0} \ No newline at end of file diff --git a/v2dat/100-format-logtime.patch b/v2dat/patches/100-format-logtime.patch similarity index 100% rename from v2dat/100-format-logtime.patch rename to v2dat/patches/100-format-logtime.patch diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index 28d977793..bffe717bb 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -12,13 +12,13 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202309140037 +GEOIP_VER:=202309210037 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=f1ed5041ac7a83d12e0a3e3725a4ba317aba3862d63242e784d1a2124f172fac + HASH:=96a36230f66bada39b09b5613b8633bf1b2306b72fd09f452f2da6fc9739edd6 endef GEOSITE_VER:=20230919171517