From 5e145e81dbc18d898145e7457318b285666a6583 Mon Sep 17 00:00:00 2001 From: Dimitry Kolyshev Date: Fri, 24 Mar 2023 15:13:04 +0300 Subject: [PATCH] Pull request: Configuration: disabled_until Merge in DNS/adguard-home-wiki from 1333-protection-pause to master Squashed commit of the following: commit ec51cf8701205d6a8da5d72f78d75357a5297cd5 Merge: 371f25f 3c5b862 Author: Dimitry Kolyshev Date: Thu Mar 23 22:35:07 2023 +0700 Merge remote-tracking branch 'origin/master' into 1333-protection-pause commit 371f25fefaff11c852fd7c937ab979c48a125f5a Author: Dimitry Kolyshev Date: Thu Feb 2 22:19:08 2023 +0700 Configuration: protection_disabled_until commit 42dd2dce28a6ca6facb4ae978cceae8e7f4d6030 Author: Dimitry Kolyshev Date: Tue Jan 31 11:43:24 2023 +0700 Configuration: disabled_until commit 37e8a59407cc53fe4b34e1b51034faa86a18a5b2 Author: Dimitry Kolyshev Date: Mon Jan 30 13:11:31 2023 +0700 Configuration: disabled_until --- Configuration.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration.md b/Configuration.md index bec709c..2c98c2d 100644 --- a/Configuration.md +++ b/Configuration.md @@ -371,6 +371,7 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib - `blocking_ipv4` - IP address to be returned for a blocked A request if `blocking_mode` is set to `custom_ip` - `blocking_ipv6` - IP address to be returned for a blocked AAAA request if `blocking_mode` is set to `custom_ip` - `blocked_response_ttl` — For how many seconds the clients should cache a filtered response. Low values are useful on LAN if you change filters very often, high values are useful to increase performance and save traffic. + - `protection_disabled_until` — Timestamp until when the protection is disabled. - `parental_block_host` — IP (or domain name) which is used to respond to DNS requests blocked by parental control - `safebrowsing_block_host` — IP (or domain name) which is used to respond to DNS requests blocked by safe-browsing - `parental_enabled` — Parental control-based DNS requests filtering.