summaryrefslogtreecommitdiff
path: root/Mailman/Defaults.py
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/Defaults.py')
-rw-r--r--Mailman/Defaults.py28
1 files changed, 15 insertions, 13 deletions
diff --git a/Mailman/Defaults.py b/Mailman/Defaults.py
index c4d9d7dbc..e37545e52 100644
--- a/Mailman/Defaults.py
+++ b/Mailman/Defaults.py
@@ -121,9 +121,6 @@ DEFAULT_VAR_DIRECTORY = '/var/mailman'
# any variable in the Configuration object.
DEFAULT_DATABASE_URL = 'sqlite:///$DATA_DIR/mailman.db'
-# For debugging purposes
-SQLALCHEMY_ECHO = False
-
#####
@@ -164,16 +161,21 @@ DEFAULT_URL_HOST = '@URLHOST@'
# Spam avoidance defaults
#####
-# This variable contains a list of 2-tuple of the format (header, regex) which
-# the Mailman/Handlers/SpamDetect.py module uses to match against the current
-# message. If the regex matches the given header in the current message, then
-# it is flagged as spam. header is case-insensitive and should not include
-# the trailing colon. regex is always matched with re.IGNORECASE.
+# This variable contains a list of tuple of the format:
+#
+# (header, pattern[, chain])
+#
+# which is used to match against the current message's headers. If the
+# pattern matches the given header in the current message, then the named
+# chain is jumped to. header is case-insensitive and should not include the
+# trailing colon. pattern is always matched with re.IGNORECASE. chain is
+# optional; if not given the 'hold' chain is used, but if given it may be any
+# existing chain, such as 'discard', 'reject', or 'accept'.
#
-# Note that the more searching done, the slower the whole process gets. Spam
-# detection is run against all messages coming to either the list, or the
-# -owners address, unless the message is explicitly approved.
-KNOWN_SPAMMERS = []
+# Note that the more searching done, the slower the whole process gets.
+# Header matching is run against all messages coming to either the list, or
+# the -owners address, unless the message is explicitly approved.
+HEADER_MATCHES = []
@@ -922,7 +924,7 @@ ${web_page_url}listinfo${cgiext}/${list_name}
DEFAULT_SCRUB_NONDIGEST = False
# Mail command processor will ignore mail command lines after designated max.
-DEFAULT_MAIL_COMMANDS_MAX_LINES = 25
+EMAIL_COMMANDS_MAX_LINES = 10
# Is the list owner notified of admin requests immediately by mail, as well as
# by daily pending-request reminder?