summaryrefslogtreecommitdiff
path: root/mailman/pipeline
diff options
context:
space:
mode:
Diffstat (limited to 'mailman/pipeline')
-rw-r--r--mailman/pipeline/cook_headers.py4
-rw-r--r--mailman/pipeline/decorate.py3
-rw-r--r--mailman/pipeline/docs/acknowledge.txt1
-rw-r--r--mailman/pipeline/docs/cook-headers.txt10
-rw-r--r--mailman/pipeline/docs/digests.txt7
-rw-r--r--mailman/pipeline/docs/replybot.txt1
6 files changed, 8 insertions, 18 deletions
diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py
index a37a92a69..18000e01a 100644
--- a/mailman/pipeline/cook_headers.py
+++ b/mailman/pipeline/cook_headers.py
@@ -216,9 +216,7 @@ def process(mlist, msg, msgdata):
headers['List-Post'] = '<mailto:%s>' % mlist.posting_address
# Add RFC 2369 and 5064 archiving headers, if archiving is enabled.
if mlist.archive:
- for archiver in get_plugins('mailman.archiver'):
- if not archiver.is_enabled:
- continue
+ for archiver in config.archivers:
headers['List-Archive'] = '<%s>' % archiver.list_url(mlist)
permalink = archiver.permalink(mlist, msg)
if permalink is not None:
diff --git a/mailman/pipeline/decorate.py b/mailman/pipeline/decorate.py
index 3059bde38..4e4b1b97b 100644
--- a/mailman/pipeline/decorate.py
+++ b/mailman/pipeline/decorate.py
@@ -202,10 +202,9 @@ def decorate(mlist, template, extradict=None):
list_name = mlist.list_name,
fqdn_listname = mlist.fqdn_listname,
host_name = mlist.host_name,
- web_page_url = mlist.web_page_url,
+ listinfo_page = mlist.script_url('listinfo'),
description = mlist.description,
info = mlist.info,
- cgiext = Defaults.CGIEXT,
)
if extradict is not None:
d.update(extradict)
diff --git a/mailman/pipeline/docs/acknowledge.txt b/mailman/pipeline/docs/acknowledge.txt
index d1206b6f3..aabd8196a 100644
--- a/mailman/pipeline/docs/acknowledge.txt
+++ b/mailman/pipeline/docs/acknowledge.txt
@@ -11,7 +11,6 @@ acknowledgment.
>>> mlist.preferred_language = u'en'
>>> # XXX This will almost certainly change once we've worked out the web
>>> # space layout for mailing lists now.
- >>> mlist.web_page_url = u'http://lists.example.com/'
>>> # Ensure that the virgin queue is empty, since we'll be checking this
>>> # for new auto-response messages.
diff --git a/mailman/pipeline/docs/cook-headers.txt b/mailman/pipeline/docs/cook-headers.txt
index 985214079..eb1a4e6bc 100644
--- a/mailman/pipeline/docs/cook-headers.txt
+++ b/mailman/pipeline/docs/cook-headers.txt
@@ -12,9 +12,6 @@ is getting sent through the system. We'll take things one-by-one.
>>> mlist.subject_prefix = u''
>>> mlist.include_list_post_header = False
>>> mlist.archive = True
- >>> # XXX This will almost certainly change once we've worked out the web
- >>> # space layout for mailing lists now.
- >>> mlist.web_page_url = u'http://lists.example.com/'
Saving the original sender
@@ -183,7 +180,6 @@ But normally, a list will include these headers.
>>> mlist.include_rfc2369_headers = True
>>> mlist.include_list_post_header = True
>>> mlist.preferred_language = u'en'
- >>> config.archivers['pipermail'].is_enabled = True
>>> msg = message_from_string("""\
... From: aperson@example.com
... Message-ID: <12345>
@@ -192,7 +188,7 @@ But normally, a list will include these headers.
>>> process(mlist, msg, {})
>>> list_headers(msg)
---start---
- List-Archive: <http://www.example.com/pipermail/_xtest@example.com>
+ List-Archive: <http://lists.example.com/pipermail/_xtest@example.com>
List-Help: <mailto:_xtest-request@example.com?subject=help>
List-Id: <_xtest.example.com>
List-Post: <mailto:_xtest@example.com>
@@ -213,7 +209,7 @@ header.
>>> process(mlist, msg, {})
>>> list_headers(msg)
---start---
- List-Archive: <http://www.example.com/pipermail/_xtest@example.com>
+ List-Archive: <http://lists.example.com/pipermail/_xtest@example.com>
List-Help: <mailto:_xtest-request@example.com?subject=help>
List-Id: My test mailing list <_xtest.example.com>
List-Post: <mailto:_xtest@example.com>
@@ -252,7 +248,7 @@ List-Post header, which is reasonable for an announce only mailing list.
>>> process(mlist, msg, {})
>>> list_headers(msg)
---start---
- List-Archive: <http://www.example.com/pipermail/_xtest@example.com>
+ List-Archive: <http://lists.example.com/pipermail/_xtest@example.com>
List-Help: <mailto:_xtest-request@example.com?subject=help>
List-Id: My test mailing list <_xtest.example.com>
List-Subscribe: <http://lists.example.com/listinfo/_xtest@example.com>,
diff --git a/mailman/pipeline/docs/digests.txt b/mailman/pipeline/docs/digests.txt
index 7ef82382f..e94f9912f 100644
--- a/mailman/pipeline/docs/digests.txt
+++ b/mailman/pipeline/docs/digests.txt
@@ -9,7 +9,6 @@ digests, although only two are currently supported: MIME digests and RFC 1153
>>> from mailman.pipeline.to_digest import process
>>> mlist = config.db.list_manager.create(u'_xtest@example.com')
>>> mlist.preferred_language = u'en'
- >>> mlist.web_page_url = u'http://www.example.com/'
>>> mlist.real_name = u'XTest'
>>> mlist.subject_prefix = u'[_XTest] '
>>> mlist.one_last_digest = set()
@@ -126,7 +125,7 @@ digest and an RFC 1153 plain text digest. The size threshold is in KB.
_xtest@example.com
<BLANKLINE>
To subscribe or unsubscribe via the World Wide Web, visit
- http://www.example.com/listinfo/_xtest@example.com
+ http://lists.example.com/listinfo/_xtest@example.com
or, via email, send a message with subject or body 'help' to
_xtest-request@example.com
<BLANKLINE>
@@ -276,7 +275,7 @@ digest and an RFC 1153 plain text digest. The size threshold is in KB.
_xtest@example.com
<BLANKLINE>
To subscribe or unsubscribe via the World Wide Web, visit
- http://www.example.com/listinfo/_xtest@example.com
+ http://lists.example.com/listinfo/_xtest@example.com
or, via email, send a message with subject or body 'help' to
_xtest-request@example.com
<BLANKLINE>
@@ -464,7 +463,7 @@ Set the digest threshold to zero so that the digests will be sent immediately.
_xtest@example.com
<BLANKLINE>
Pour vous (d=E9s)abonner par le web, consultez
- http://www.example.com/listinfo/_xtest@example.com
+ http://lists.example.com/listinfo/_xtest@example.com
<BLANKLINE>
ou, par courriel, envoyez un message avec =AB=A0help=A0=BB dans le corps ou
dans le sujet =E0
diff --git a/mailman/pipeline/docs/replybot.txt b/mailman/pipeline/docs/replybot.txt
index f9f824e4e..f3c3281b3 100644
--- a/mailman/pipeline/docs/replybot.txt
+++ b/mailman/pipeline/docs/replybot.txt
@@ -9,7 +9,6 @@ message or the amount of time since the last auto-response.
>>> from mailman.pipeline.replybot import process
>>> mlist = config.db.list_manager.create(u'_xtest@example.com')
>>> mlist.real_name = u'XTest'
- >>> mlist.web_page_url = u'http://www.example.com/'
>>> # Ensure that the virgin queue is empty, since we'll be checking this
>>> # for new auto-response messages.
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-16 02:34:12 +0000