From 951fd30eb76b958feb86abe6df5b8934db9f896f Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Wed, 14 Jun 2023 15:26:18 +0300 Subject: [PATCH] Pull request 169: 951-blocked-services-schedule Merge in GO/adguard-home-wiki from 951-blocked-services-schedule to master Squashed commit of the following: commit 9e160372bd536b46f054e3ab4dec1e0448f112da Author: Stanislav Chzhen Date: Wed Jun 14 15:07:45 2023 +0300 Configuration: bump version commit bc5e0e5c17892176b5f5a4c7729f375517aa2a8f Author: Stanislav Chzhen Date: Tue Jun 13 11:39:56 2023 +0300 Configuration: imp docs commit e355e4f18e38b15be7247b03e8fa10aabbd0be86 Author: Stanislav Chzhen Date: Thu Jun 8 19:18:32 2023 +0300 Configuration: imp example commit ae68d1b2bfd00386ece2650203658f93edde7e3c Author: Stanislav Chzhen Date: Wed Jun 7 20:03:28 2023 +0300 Configuration: upd example commit 43a45b0b849daa7788db6ad2dcbb91b81f1daf0b Author: Stanislav Chzhen Date: Fri Jun 2 12:56:07 2023 +0300 Configuration: imp docs commit 982f071924b647fb2eb456f744ea8ce29e7fe39e Author: Stanislav Chzhen Date: Thu Jun 1 11:51:09 2023 +0300 Configuration: imp docs more commit 3231a6e4412db31ac8de84faa7ab16ecd2f06ef9 Author: Stanislav Chzhen Date: Wed May 31 20:17:55 2023 +0300 Configuration: imp docs commit adf31b3ac89813731d62a49944020a4865744660 Author: Stanislav Chzhen Date: Wed May 31 19:53:21 2023 +0300 Configuration: add one more new line commit de83803377595708d4bb4b6d0c3d049f2cd25851 Author: Stanislav Chzhen Date: Wed May 31 19:49:20 2023 +0300 Configuration: add new line commit 6bda231b1a07fd352afce25d6d3be8b32b366734 Author: Stanislav Chzhen Date: Wed May 31 17:57:59 2023 +0300 Configuration: blocked services settings --- Configuration.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Configuration.md b/Configuration.md index 051d5a7..f430853 100644 --- a/Configuration.md +++ b/Configuration.md @@ -360,6 +360,45 @@ Settings are stored in [YAML format](https://en.wikipedia.org/wiki/YAML), possib ``` - `port` — DNS server port to listen on. - `anonymize_client_ip` - If true, anonymize clients' IP addresses in logs and stats + - `blocked_services` (**since v0.107.33**): Blocked services settings + section: + - `ids`: List of blocked services. + - `schedule`: Sets periods of inactivity for filtering blocked services. + The schedule contains 7 days (Sunday to Saturday) and a time zone. Each + day consists of `start` and `end`, which are the durations from the start + of day. Duration is a string in human-readable format. `start` is + greater or equal to `0s` and less than `24h`. `end` must be greater than + `start` and less or equal to '24h'. `start` and `end` are expected to be + rounded to minutes. + + Example of valid configuration: + + ```yaml + 'blocked_services': + 'ids': + - 'onlyfans' + 'schedule': + 'sun': + 'start': '0s' + 'end': '24h' + 'mon': + 'start': '10m' + 'end': '23h50m' + 'tue': + 'start': '20m' + 'end': '23h40m' + # No schedule for Wednesday. + 'thu': + 'start': '40m' + 'end': '23h20m' + 'fri': + 'start': '50m' + 'end': '23h10m' + 'sat': + 'start': '1h' + 'end': '23h' + 'time_zone': 'America/New_York' + ``` - **Protection settings** - `protection_enabled` — Whether any kind of filtering and protection should be performed. **Since v0.107.0** it doesn't affect the rules with