update configuration

pymumu · Dec 29, 2023 · 85bb720 · 85bb720
1 parent b6b937b
commit 85bb720
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/docs/config/server-config.md b/docs/config/server-config.md
@@ -94,11 +94,15 @@ bind-*参数除了支持基本的启用服务外，还支持更多的附加特
 
     |参数|功能|
     |---|---|
-    |-no-rule-addr|跳过 address 规则|
-    |-no-rule-nameserver|跳过 Nameserver 规则|
-    |-no-rule-ipset|跳过 ipset 和 nftset 规则|
-    |-no-rule-soa|跳过 SOA(#) 规则|
-    |-no-dualstack-selection|停用双栈测速|
-    |-no-speed-check|停用测速|
-    |-no-cache|停止缓存|
-    |-force-aaaa-soa|禁用IPV6查询|
+    |`-group`|设置对应的上游服务器组|
+    |`-no-rule-addr`|跳过 address 规则|
+    |`-no-rule-nameserver`|跳过 Nameserver 规则|
+    |`-no-rule-ipset`|跳过 ipset 和 nftset 规则|
+    |`-no-rule-soa`|跳过 SOA(#) 规则|
+    |`-no-dualstack-selection`|停用双栈测速|
+    |`-no-speed-check`|停用测速|
+    |`-no-cache`|停止缓存|
+    |`-force-aaaa-soa`|禁用IPV6查询|
+    |`-no-ip-alias`|忽略ip集合规则|
+    |`-ipset [ipsetname]`|将对应请求的结果放入指定ipset|
+    |`-nftset [nftsetname]`|将对应的请求结果放入指定的nftset|
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -31,18 +31,21 @@ hide:
 | rr-ttl-reply-max | 允许返回给客户端的最大 TTL 值 | 远程查询结果 | 大于 0 的数字 | rr-ttl-reply-max 60 |
 | local-ttl | 本地HOST，address的TTL值 | rr-ttl-min | 大于 0 的数字 | local-ttl  60 |
 | max-reply-ip-num | 允许返回给客户的最大IP数量 | IP数量 | 大于 0 的数字 | max-reply-ip-num 1 |
+| max-query-limit | 最大并发请求数量 | 65535 | 请求数量 | max-query-limit 1000 |
 | log-level | 设置日志级别 | error | off、fatal、error、warn、notice、info 或 debug | log-level error |
 | log-file | 日志文件路径 | /var/log/<br />smartdns/<br />smartdns.log | 合法路径字符串 | log-file /var/log/smartdns/smartdns.log |
 | log-size | 日志大小 | 128K | 数字 + K、M 或 G | log-size 128K |
 | log-num | 日志归档个数 | openwrt为2， 其他系统为8 | 大于等于 0 的数字，0表示禁用日志 | log-num 2 |
 | log-file-mode | 日志归档文件权限 | 0640 | 文件权限 | log-file-mode 644 |
 | log-console | 是否输出日志到控制台 | no | [yes\|no] | log-console yes |
+| log-syslog | 是否输出日志到系统日志 | no | [yes\|no] | log-syslog yes |
 | audit-enable | 设置审计启用 | no | [yes\|no] | audit-enable yes |
 | audit-file | 审计文件路径 | /var/log/<br />smartdns/<br />smartdns-audit.log | 合法路径字符串 | audit-file /var/log/smartdns/smartdns-audit.log |
 | audit-size | 审计大小 | 128K | 数字 + K、M 或 G | audit-size 128K |
 | audit-num | 审计归档个数 | 2 | 大于等于 0 的数字 | audit-num 2 |
 | audit-file-mode | 审计归档文件权限 | 0640 | 文件权限 | log-file-mode 644 |
 | audit-console | 是否输出审计日志到控制台 | no | [yes\|no] | audit-console yes |
+| audit-syslog | 是否输出审计日志到系统日志 | no | [yes\|no] | audit-syslog yes |
 | conf-file | 附加配置文件 | 无 | 合法路径字符串，通配符号 | conf-file /etc/smartdns/smartdns.more.conf <br /> conf-file *.conf |
 | server | 上游 UDP DNS | 无 | 可重复。<br />[ip][:port]\|URL：服务器 IP:端口（可选）或 URL <br />[-blacklist-ip]：配置 IP 过滤结果。<br />[-whitelist-ip]：指定仅接受参数中配置的 IP 范围<br />[-g\|-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用<br />[-e\|-exclude-default-group]：将 DNS 服务器从默认组中排除。<br />[-set-mark mark]：设置数据包标记so-mark。<br />[-p\|-proxy name]：设置代理服务器。 <br />[-b\|-bootstrap-dns]：标记此服务器为bootstrap服务器。<br />[-subnet]：指定服务器使用的edns-client-subnet| server 8.8.8.8:53 -blacklist-ip -group g1 -proxy proxy<br /> server tls://8.8.8.8|
 | server-tcp | 上游 TCP DNS | 无 | 可重复。<br />[ip][:port]：服务器 IP:端口（可选）<br />[-blacklist-ip]：配置 IP 过滤结果<br />[-whitelist-ip]：指定仅接受参数中配置的 IP 范围。<br />[-g\|-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用<br />[-e\|-exclude-default-group]：将 DNS 服务器从默认组中排除。<br />[-set-mark mark]：设置数据包标记so-mark。<br />[-p\|-proxy name]：设置代理服务器。 <br />[-b\|-bootstrap-dns]：标记此服务器为bootstrap服务器。<br />[-subnet]：指定服务器使用的edns-client-subnet| server-tcp 8.8.8.8:53 |

diff --git a/en/docs/config/server-config.md b/en/docs/config/server-config.md
@@ -93,6 +93,7 @@ In addition to supporting basic service, the `bind-*` parameter also supports mo
 
    | Parameter | Function                                  |
    | --------- | ---------------------------------------- |
+   | `-group` | Set the corresponding upstream server group |
    | `-no-rule-addr` | Skip address rules                  |
    | `-no-rule-nameserver` | Skip Nameserver rules           |
    | `-no-rule-ipset` | Skip ipset and nftset rules         |
@@ -101,3 +102,6 @@ In addition to supporting basic service, the `bind-*` parameter also supports mo
    | `-no-speed-check` | Disable speed test                       |
    | `-no-cache` | Stop caching                               |
    | `-force-aaaa-soa` | Disable IPV6 queries                |
+   | `-no-ip-alias` |Ignore IP alias rules|
+   | `-ipset [ipsetname]` |Put the corresponding request result into the specified ipset|
+   | `-nftset [nftsetname]` |Put the corresponding request result into the specified nftset|
diff --git a/en/docs/configuration.md b/en/docs/configuration.md
@@ -27,18 +27,21 @@ hide:
 |rr-ttl-reply-max|Domain name Minimum Reply TTL|Remote query result|number greater than 0|rr-ttl-reply-max 60
 |rr-ttl-max|Domain name Maximum TTL|Remote query result|number greater than 0|rr-ttl-max 600
 |max-reply-ip-num|Maximum number of IPs returned to the client|8|number of IPs, 1~16 |max-reply-ip-num 1
+|max-query-limit|Maximum concurrent number of requests.| 65535 | Number of requests | max-query-limit 1000 |
 |log-level|log level|error|off,fatal,error,warn,notice,info,debug|log-level error
 |log-file|log path|/var/log/<br />smartdns/<br />smartdns.log|File Pah|log-file /var/log/smartdns/smartdns.log
 |log-size|log size|128K|number+K,M,G|log-size 128K
 |log-num|archived log number|2 for openwrt, 8 for other system|Integer, 0 means turn off the log|log-num 2
 |log-file-mode|archived log file mode|0640|Integer|log-file-mode 644
 |log-console|enable output log to console|no|[yes\|no]|log-console yes
+|log-console|enable output log to syslog|no|[yes\|no]|log-console yes
 |audit-enable|audit log enable|no|[yes\|no]|audit-enable yes
 |audit-file|audit log file|/var/log/<br />smartdns/<br />smartdns-audit.log|File Path|audit-file /var/log/smartdns/smartdns-audit.log
 |audit-size|audit log size|128K|number+K,M,G|audit-size 128K
 |audit-num|archived audit log number|2|Integer, 0 means turn off the log|audit-num 2
 |audit-file-mode|archived audit log file mode|0640|Integer|audit-file-mode 644
 |audit-console|enable output audit log to console|no|[yes\|no]|audit-console yes
+|audit-syslog|enable output audit log to syslog|no|[yes\|no]|audit-syslog yes
 |conf-file|additional conf file|None|File path, wildcard |conf-file /etc/smartdns/smartdns.more.conf <br /> conf-file *.conf 
 |server|Upstream UDP DNS server|None|Repeatable <br />`[ip][:port]|URL`: Server IP, port optional OR URL. <br />`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip". <br />`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted. <br />`[-g|-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver. <br />`[-e|-exclude-default-group]`: Exclude DNS servers from the default group. <br />`[-set-mark mark]`: set mark on packets <br /> `[-p|-proxy name]`: set proxy server <br /> `[-b\|-bootstrap-dns]`: set as bootstrap dns server <br />[-subnet]：set per server edns-client-subnet | server 8.8.8.8:53 -blacklist-ip<br />server tls://8.8.8.8
 |server-tcp|Upstream TCP DNS server|None|Repeatable <br />`[ip][:port]`: Server IP, port optional. <br />`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip". <br />`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted. <br />`[-g|-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver. <br />`[-e|-exclude-default-group]`: Exclude DNS servers from the default group <br />`[-set-mark mark]`: set mark on packets <br /> `[-p|-proxy name]`: set proxy server <br /> `[-b\|-bootstrap-dns]`: set as bootstrap dns server <br />[-subnet]：set per server edns-client-subnet | server-tcp 8.8.8.8:53