aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Defaults.py.in
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-03-02 18:57:16 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-03-02 18:57:16 +0900
commit3d3ed445c841f40e793e733956ab65287ca5cfe1 (patch)
treef54b733b0a6a3353cb595d6c4664689ea5bf8a3f /Mailman/Defaults.py.in
parent7bee928877b9771072c32c47912b346b41ce3c35 (diff)
parent8f22ba21a32701d2efaac0b8b1a1c0a4522912b0 (diff)
downloadmailman2-3d3ed445c841f40e793e733956ab65287ca5cfe1.tar.gz
mailman2-3d3ed445c841f40e793e733956ab65287ca5cfe1.tar.xz
mailman2-3d3ed445c841f40e793e733956ab65287ca5cfe1.zip
Update to lp:mailman/2.1 rev 1629 (no difference against the original branch
Diffstat (limited to '')
-rwxr-xr-xMailman/Defaults.py.in16
1 files changed, 15 insertions, 1 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 8c5d9e7b..04d7db8a 100755
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -136,7 +136,7 @@ SUBSCRIBE_FORM_MIN_TIME = seconds(5)
# in the installation. This supplements the individual list's ban_list.
# For example, to ban xxx@aol.com and any @gmail.com address beginning with
# yyy, set
-# GLOBAL_BAN_LIST = ['xxx@aol.com', '^yyy.*@gmail\.com']
+# GLOBAL_BAN_LIST = ['xxx@aol.com', '^yyy.*@gmail\.com$']
GLOBAL_BAN_LIST = []
# Command that is used to convert text/html parts into plain text. This
@@ -153,6 +153,13 @@ ACCEPTABLE_LISTNAME_CHARACTERS = '[-+_.=a-z0-9]'
# in list rosters? Defaults to No to preserve prior behavior.
ROSTER_DISPLAY_REALNAME = No
+# Beginning in Mailman 2.1.21, localized help and some other output from
+# Mailman's bin/ commands is converted to the character set of the user's
+# workstation (LC_CTYPE) if different from the character set of the language.
+# This is not well tested over a wide range of locales, so if it causes
+# problems, it can be disabled by setting the following to Yes.
+DISABLE_COMMAND_LOCALE_CSET = No
+
#####
@@ -1130,6 +1137,13 @@ DMARC_RESOLVER_TIMEOUT = seconds(3)
# The total time to spend trying to get an answer to the question.
DMARC_RESOLVER_LIFETIME = seconds(5)
+# A URL from which to retrieve the data for the algorithm that computes
+# Organizational Domains for DMARC policy lookup purposes. This can be
+# anything handled by the Python urllib2.urlopen function. See
+# https://publicsuffix.org/list/ for info.
+DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL = \
+'https://publicsuffix.org/list/public_suffix_list.dat'
+
# Should the list server auto-moderate members who post too frequently
# This is intended to stop people who join a list and then use a bot to
# send many spam messages in a short interval. These are default settings