GNU Mailman

Merge lp:~futatuki/mailman/fix-Defaults.py into lp:mailman/2.1

  1. fix-Defaults.py
  2. Merge into 2.1
Proposed by Yasuhito FUTATSUKI at POEM
Status: Merged
Merged at revision: 1792
Proposed branch: lp:~futatuki/mailman/fix-Defaults.py
Merge into: lp:mailman/2.1
Diff against target: 17 lines (+4/-2)
1 file modified
Mailman/Defaults.py.in (+4/-2)
To merge this branch: bzr merge lp:~futatuki/mailman/fix-Defaults.py
Reviewer Review Type Date Requested Status
Mark Sapiro Approve
Review via email: mp+349388@code.launchpad.net

Commit message

add description about IPv6 support of subscribe blocking to Defaults.py.in
fix a typo in comment of BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE

To post a comment you must log in.
Revision history for this message
Mark Sapiro (msapiro) wrote :

Thank you for this and for all your help.

I also changed 'IF' to 'If' in these docs

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in 2018-06-13 08:22:47 +0000
+++ Mailman/Defaults.py.in 2018-07-12 02:35:48 +0000
@@ -147,10 +147,12 @@
147147
148# IF the following is set to Yes, and a web subscribe comes from an IPv4148# IF the following is set to Yes, and a web subscribe comes from an IPv4
149# address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription149# address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription
150# will be blocked.150# will be blocked. It will work with IPv6 addresses if Python's py2-ipaddress
151# module is installed. The module can be installed via pip if not included
152# in your Python.
151BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No153BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
152154
153# IF the following is set to Yes, and a subscriper uses a domain that is155# IF the following is set to Yes, and a subscriber uses a domain that is
154# listed in the Spamhaus DBL, the subscription will be blocked.156# listed in the Spamhaus DBL, the subscription will be blocked.
155BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE = No157BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE = No
156158