rename MilterConfig to QuarantineMilterConfig

This commit is contained in:
2021-10-08 13:37:05 +02:00
parent d7ff5d7937
commit acecac14da
2 changed files with 4 additions and 6 deletions

View File

@@ -26,7 +26,7 @@ __all__ = [
"QuarantineConfig", "QuarantineConfig",
"ActionConfig", "ActionConfig",
"RuleConfig", "RuleConfig",
"MilterConfig", "QuarantineMilterConfig",
"get_milter_config"] "get_milter_config"]
import json import json
@@ -315,7 +315,7 @@ class RuleConfig(BaseConfig):
self["actions"] = actions self["actions"] = actions
class MilterConfig(BaseConfig): class QuarantineMilterConfig(BaseConfig):
JSON_SCHEMA = { JSON_SCHEMA = {
"type": "object", "type": "object",
"required": ["rules"], "required": ["rules"],
@@ -365,4 +365,4 @@ def get_milter_config(cfgfile, raw=False):
raise RuntimeError(f"{e}\n{msg}") raise RuntimeError(f"{e}\n{msg}")
if raw: if raw:
return cfg return cfg
return MilterConfig(cfg) return QuarantineMilterConfig(cfg)

View File

@@ -1,9 +1,7 @@
# This is an example /etc/pyquarantine/pyquarantine.conf file. # This is an example /etc/pyquarantine/pyquarantine.conf file.
# Copy it into place before use. # Copy it into place before use.
# #
# The file is in JSON format. # The file is in JSON format, but comments are allowed.
#
# The global option 'log' can be overriden per rule or per modification.
# #
{ {
# Section: global # Section: global