diff --git a/.gitignore b/.gitignore index 6ebcbb2..bb93d3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ site en/site - +src +test .vscode .DS_Store diff --git a/docs/config/forwarding-with-ipset.md b/docs/config/forwarding-with-ipset.md index aa0ee10..d0809dc 100644 --- a/docs/config/forwarding-with-ipset.md +++ b/docs/config/forwarding-with-ipset.md @@ -176,7 +176,7 @@ flowchart ## 本机1081端口启用转发程序 -本机下载安装TPROXY模式的转发程序，并启用1081端口的数据查询服务。 +本机下载安装TPROXY模式的转发程序，并启用1081端口的数据转发服务。 ## 额外说明 diff --git a/docs/configuration.md b/docs/configuration.md index 5a16a1a..91ecbdc 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -34,11 +34,13 @@ hide: | 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 | | audit-enable | 设置审计启用 | no | [yes\|no] | audit-enable yes | | audit-file | 审计文件路径 | /var/log/
smartdns/
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 | | conf-file | 附加配置文件 | 无 | 合法路径字符串 | conf-file /etc/smartdns/smartdns.more.conf | | server | 上游 UDP DNS | 无 | 可重复。
[ip][:port]\|URL：服务器 IP:端口（可选）或 URL
[-blacklist-ip]：配置 IP 过滤结果。
[-whitelist-ip]：指定仅接受参数中配置的 IP 范围
[-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用
[-exclude-default-group]：将 DNS 服务器从默认组中排除。
[-set-mark mark]：设置数据包标记so-mark。
[-proxy name]：设置代理服务器。
[-bootstrap-dns]：标记此服务器为bootstrap服务器。| server 8.8.8.8:53 -blacklist-ip -group g1 -proxy proxy
server tls://8.8.8.8| | server-tcp | 上游 TCP DNS | 无 | 可重复。
[ip][:port]：服务器 IP:端口（可选）
[-blacklist-ip]：配置 IP 过滤结果
[-whitelist-ip]：指定仅接受参数中配置的 IP 范围。
[-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用
[-exclude-default-group]：将 DNS 服务器从默认组中排除。
[-set-mark mark]：设置数据包标记so-mark。
[-proxy name]：设置代理服务器。
[-bootstrap-dns]：标记此服务器为bootstrap服务器。| server-tcp 8.8.8.8:53 | diff --git a/en/docs/configuration.md b/en/docs/configuration.md index 2330a37..e4c458e 100644 --- a/en/docs/configuration.md +++ b/en/docs/configuration.md @@ -30,11 +30,13 @@ hide: |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 |audit-enable|audit log enable|no|[yes\|no]|audit-enable yes |audit-file|audit log file|/var/log/
smartdns/
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 |conf-file|additional conf file|None|File path|conf-file /etc/smartdns/smartdns.more.conf |server|Upstream UDP DNS server|None|Repeatable
`[ip][:port]\|URL`: Server IP, port optional OR URL.
`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip".
`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted.
`[-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver.
`[-exclude-default-group]`: Exclude DNS servers from the default group.
`[-set-mark mark]`: set mark on packets
`[-proxy name]`: set proxy server
`[-bootstrap-dns]`: set as bootstrap dns server | server 8.8.8.8:53 -blacklist-ip
server tls://8.8.8.8 |server-tcp|Upstream TCP DNS server|None|Repeatable
`[ip][:port]`: Server IP, port optional.
`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip".
`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted.
`[-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver.
`[-exclude-default-group]`: Exclude DNS servers from the default group
`[-set-mark mark]`: set mark on packets
`[-proxy name]`: set proxy server
`[-bootstrap-dns]`: set as bootstrap dns server | server-tcp 8.8.8.8:53