diff options
| author | Mark Sapiro | 2016-12-26 14:43:36 -0800 |
|---|---|---|
| committer | Mark Sapiro | 2016-12-26 14:43:36 -0800 |
| commit | 2ead4c9f0f70ac3ebd06105562579f74fa6963f1 (patch) | |
| tree | a59cf040acff390d7b5847cf08f84ff5b51dbcfb /src/mailman/chains | |
| parent | 17aa36cf4a5ec2cfce7b1e6af585b0f18a82a28b (diff) | |
| download | mailman-2ead4c9f0f70ac3ebd06105562579f74fa6963f1.tar.gz mailman-2ead4c9f0f70ac3ebd06105562579f74fa6963f1.tar.zst mailman-2ead4c9f0f70ac3ebd06105562579f74fa6963f1.zip | |
Simplified the various list settings and remamed several things.
Diffstat (limited to 'src/mailman/chains')
| -rw-r--r-- | src/mailman/chains/builtin.py | 2 | ||||
| -rw-r--r-- | src/mailman/chains/docs/moderation.rst | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mailman/chains/builtin.py b/src/mailman/chains/builtin.py index 3bf0fd5b5..e26c38470 100644 --- a/src/mailman/chains/builtin.py +++ b/src/mailman/chains/builtin.py @@ -41,7 +41,7 @@ class BuiltInChain: # First check DMARC. For a reject or discard, the rule hits and we # jump to the moderation chain to do the action. Otherwise, the rule # misses buts sets msgdata['dmarc'] for the handler. - ('dmarc-moderation', LinkAction.jump, 'moderation'), + ('dmarc-mitigation', LinkAction.jump, 'moderation'), ('approved', LinkAction.jump, 'accept'), ('emergency', LinkAction.jump, 'hold'), ('loop', LinkAction.jump, 'discard'), diff --git a/src/mailman/chains/docs/moderation.rst b/src/mailman/chains/docs/moderation.rst index 53c32bc33..e3c9e12f5 100644 --- a/src/mailman/chains/docs/moderation.rst +++ b/src/mailman/chains/docs/moderation.rst @@ -87,7 +87,7 @@ built-in chain. No rules hit and so the message is accepted. Subject: aardvark Hits: Misses: - dmarc-moderation + dmarc-mitigation approved emergency loop @@ -125,7 +125,7 @@ moderator approval. Hits: member-moderation Misses: - dmarc-moderation + dmarc-mitigation approved emergency loop @@ -152,7 +152,7 @@ Anne's moderation action can also be set to `discard`... Hits: member-moderation Misses: - dmarc-moderation + dmarc-mitigation approved emergency loop @@ -178,7 +178,7 @@ Anne's moderation action can also be set to `discard`... Hits: member-moderation Misses: - dmarc-moderation + dmarc-mitigation approved emergency loop @@ -219,7 +219,7 @@ moderator approval. Hits: nonmember-moderation Misses: - dmarc-moderation + dmarc-mitigation approved emergency loop |