aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Defaults.py.in
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2018-06-06 02:18:30 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2018-06-06 02:18:30 +0900
commite591f51039f4ebc4a52d6a8aac210d8ebb7978de (patch)
tree004c9f8ba6a59659e2ea930f5f74403a269627f8 /Mailman/Defaults.py.in
parent898c692842fed6e33a4bc309d9d240721a01a4c7 (diff)
parentca506e913faa49331db68f541774fdb773653988 (diff)
downloadmailman2-e591f51039f4ebc4a52d6a8aac210d8ebb7978de.tar.gz
mailman2-e591f51039f4ebc4a52d6a8aac210d8ebb7978de.tar.xz
mailman2-e591f51039f4ebc4a52d6a8aac210d8ebb7978de.zip
merge lp:mailman up to rev 1765
Diffstat (limited to 'Mailman/Defaults.py.in')
-rwxr-xr-xMailman/Defaults.py.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 4406a1f3..7a86f63c 100755
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -142,9 +142,14 @@ RECAPTCHA_SECRET_KEY = None
# 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 = []
+# IF the following is set to Yes, and a web subscribe comes from an IPv4
+# address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription
+# will be blocked.
+BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
+
# Command that is used to convert text/html parts into plain text. This
# should output results to standard output. %(filename)s will contain the
# name of the temporary file that the program should operate on.
@@ -1746,6 +1751,7 @@ add_language('cs', _('Czech'), 'iso-8859-2', 'ltr')
add_language('da', _('Danish'), 'iso-8859-1', 'ltr')
add_language('de', _('German'), 'iso-8859-1', 'ltr')
add_language('en', _('English (USA)'), 'us-ascii', 'ltr')
+add_language('eo', _('Esperanto'), 'utf-8', 'ltr')
add_language('es', _('Spanish (Spain)'), 'iso-8859-1', 'ltr')
add_language('et', _('Estonian'), 'iso-8859-15', 'ltr')
add_language('eu', _('Euskara'), 'iso-8859-15', 'ltr') # Basque