From b1bf9b1c5948c2c483bfb59de76262b8490642d1 Mon Sep 17 00:00:00 2001 From: Oliphant Date: Mon, 1 May 2023 07:43:15 +0000 Subject: [PATCH] automated commit on 2023-05-01 07:43:15 --- config/ms-noblock.conf.toml | 2 +- config/ms-we-block.conf.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/ms-noblock.conf.toml b/config/ms-noblock.conf.toml index 2227d41..930b9a8 100644 --- a/config/ms-noblock.conf.toml +++ b/config/ms-noblock.conf.toml @@ -49,7 +49,7 @@ no_push_instance = true ## Set the mergeplan to use when dealing with overlaps between blocklists # The default 'max' mergeplan will use the harshest severity block found for a domain. # The 'min' mergeplan will use the lightest severity block found for a domain. -mergeplan = 'max' +mergeplan = 'min' ## Set which fields we import ## 'domain' and 'severity' are always imported, these are additional diff --git a/config/ms-we-block.conf.toml b/config/ms-we-block.conf.toml index f8220de..16ec082 100644 --- a/config/ms-we-block.conf.toml +++ b/config/ms-we-block.conf.toml @@ -1,4 +1,4 @@ -## All the T0 stuff m.s. doesn't block +## All the T0 stuff m.s. blocks that we don't at T0 # List of instances to read blocklists from. # If the instance makes its blocklist public, no authorization token is needed. @@ -48,7 +48,7 @@ no_push_instance = true ## Set the mergeplan to use when dealing with overlaps between blocklists # The default 'max' mergeplan will use the harshest severity block found for a domain. # The 'min' mergeplan will use the lightest severity block found for a domain. -mergeplan = 'max' +mergeplan = 'min' ## Set which fields we import ## 'domain' and 'severity' are always imported, these are additional