From 3f02f7b8f5c70b1a9bc61637a333381eaaee82b9 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 4 Sep 2024 18:56:48 +0200 Subject: [PATCH] bundles/icinga2: ignore lines starting with ;; in check_spam_blocklist --- bundles/icinga2/files/check_spam_blocklist | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/bundles/icinga2/files/check_spam_blocklist b/bundles/icinga2/files/check_spam_blocklist index c9f94df..2b1a3c3 100644 --- a/bundles/icinga2/files/check_spam_blocklist +++ b/bundles/icinga2/files/check_spam_blocklist @@ -50,17 +50,13 @@ def check_list(ip_list, blocklist, warn_ips): ]).decode().splitlines() for item in result: if item.startswith(';;'): - msgs.append('{} - {}'.format( - blocklist, - item, - )) - else: - msgs.append('{} listed in {} as {}'.format( - ip, - blocklist, - item, - )) - if (item in warn_ips or item.startswith(';;')) and returncode < 2: + continue + msgs.append('{} listed in {} as {}'.format( + ip, + blocklist, + item, + )) + if item in warn_ips and returncode < 2: returncode = 1 else: returncode = 2