diff options
| -rw-r--r-- | Mailman/Defaults.py.in | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 1f2f8446..f8bae8cc 100644 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2003 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2004 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -587,6 +587,10 @@ VERP_FORMAT = '%(bounces)s+%(mailbox)s=%(host)s' # compiled case-insensitively. VERP_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<mailbox>[^=]+)=(?P<host>[^@]+)@.*$' +# VERP format and regexp for probe messages +VERP_PROBE_FORMAT = '%(bounces)s+%(token)s' +VERP_PROBE_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<token>[^@]+)@.*$' + # A perfect opportunity for doing VERP is the password reminders, which are # already addressed individually to each recipient. Set this to Yes to enable # VERPs on all password reminders. @@ -749,22 +753,6 @@ OWNERS_CAN_ENABLE_PERSONALIZATION = No # want to edit the held message on disk. HOLD_MESSAGES_AS_PICKLES = Yes -# These define the available types of external message metadata formats, and -# the one to use by default. MARSHAL format uses Python's built-in marshal -# module. BSDDB_NATIVE uses the bsddb module compiled into Python, which -# links with whatever version of Berkeley db you've got on your system (in -# Python 2.0 this is included by default if configure can find it). ASCII -# format is a dumb repr()-based format with "key = value" Python assignments. -# It is human readable and editable (as Python source code) and is appropriate -# for execfile() food. -# -# Note! Make sure your queues are empty before you change this. -METAFMT_MARSHAL = 1 -METAFMT_BSDDB_NATIVE = 2 -METAFMT_ASCII = 3 - -METADATA_FORMAT = METAFMT_MARSHAL - # This variable controls the order in which list-specific category options are # presented in the admin cgi page. ADMIN_CATEGORIES = [ @@ -1051,8 +1039,8 @@ DEFAULT_BOUNCE_NOTIFY_OWNER_ON_REMOVAL = Yes # General time limits ##### -# How long should subscriptions requests await confirmation before being -# dropped? +# Default length of time a pending request is live before it is evicted from +# the pending database. PENDING_REQUEST_LIFE = days(3) # How long should messages which have delivery failures continue to be @@ -1099,19 +1087,6 @@ LIST_LOCK_TIMEOUT = seconds(10) # debugging. PENDINGDB_LOCK_DEBUGGING = Off -# This variable specifies how long an attempt will be made to acquire a -# pendingdb lock by the incoming qrunner process. If the lock acquisition -# times out, the message will be re-queued for later delivery. -PENDINGDB_LOCK_TIMEOUT = seconds(30) - -# The pendingdb is shared among all lists, and handles all list -# (un)subscriptions, admin approvals and otherwise held messages, so it is -# potentially locked a lot more often than single lists. Mailman deals with -# this by re-trying any attempts to alter the pendingdb that failed because of -# locking errors. This variable indicates how many attempt should be made -# before abandoning all hope. -PENDINGDB_LOCK_ATTEMPTS = 10 - ##### |