From acecac14da75650214a41a53a97414ddc4fbb539 Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Fri, 8 Oct 2021 13:37:05 +0200 Subject: [PATCH] rename MilterConfig to QuarantineMilterConfig --- pyquarantine/config.py | 6 +++--- pyquarantine/misc/pyquarantine.conf.example | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pyquarantine/config.py b/pyquarantine/config.py index 652ecfc..9b5ab54 100644 --- a/pyquarantine/config.py +++ b/pyquarantine/config.py @@ -26,7 +26,7 @@ __all__ = [ "QuarantineConfig", "ActionConfig", "RuleConfig", - "MilterConfig", + "QuarantineMilterConfig", "get_milter_config"] import json @@ -315,7 +315,7 @@ class RuleConfig(BaseConfig): self["actions"] = actions -class MilterConfig(BaseConfig): +class QuarantineMilterConfig(BaseConfig): JSON_SCHEMA = { "type": "object", "required": ["rules"], @@ -365,4 +365,4 @@ def get_milter_config(cfgfile, raw=False): raise RuntimeError(f"{e}\n{msg}") if raw: return cfg - return MilterConfig(cfg) + return QuarantineMilterConfig(cfg) diff --git a/pyquarantine/misc/pyquarantine.conf.example b/pyquarantine/misc/pyquarantine.conf.example index 65df9c3..338bcc4 100644 --- a/pyquarantine/misc/pyquarantine.conf.example +++ b/pyquarantine/misc/pyquarantine.conf.example @@ -1,9 +1,7 @@ # This is an example /etc/pyquarantine/pyquarantine.conf file. # Copy it into place before use. # -# The file is in JSON format. -# -# The global option 'log' can be overriden per rule or per modification. +# The file is in JSON format, but comments are allowed. # { # Section: global