mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request 196: 5345-ipset-file-comments 

Squashed commit of the following:

commit cbc102e17b3592f77e6034981aa3c462f62433c0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 2 15:12:57 2024 +0300

    Configuration: ipset file comments
Stanislav Chzhen 2024-04-08 14:28:03 +03:00
parent 7964837b2a
commit e9213804c5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Configuration.md

@ -626,7 +626,7 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib
the specified domain names to an ipset list. Syntax: the specified domain names to an ipset list. Syntax:
```none ```none
DOMAIN[,DOMAIN].../IPSET_NAME[,IPSET_NAME] DOMAIN[,DOMAIN,…]/IPSET_NAME[,IPSET_NAME,…]
``` ```
IPv4 addresses are added to an ipset list with `ipv4` family; IPv6 IPv4 addresses are added to an ipset list with `ipv4` family; IPv6
@ -636,6 +636,7 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib
`--ipset` in dnsmasq. `--ipset` in dnsmasq.
- `ipset_file` **(since v0.107.13):** Same as `ipset`, but the rules are - `ipset_file` **(since v0.107.13):** Same as `ipset`, but the rules are
read from a file. If this property is set, property `ipset` is ignored. read from a file. If this property is set, property `ipset` is ignored.
Comments (lines starting with `#`) are supported **since v0.107.48**.
- `upstream_timeout` **(since v0.107.0):** The timeout for querying upstream - `upstream_timeout` **(since v0.107.0):** The timeout for querying upstream
servers. Zero value will be rewritten with default one which is `10s`. servers. Zero value will be rewritten with default one which is `10s`.
- `resolve_clients` **(since v0.106.0):** Enable/disable resolving clients' - `resolve_clients` **(since v0.106.0):** Enable/disable resolving clients'