summaryrefslogtreecommitdiff
path: root/mailman/database
diff options
context:
space:
mode:
authorBarry Warsaw2009-01-03 05:13:41 -0500
committerBarry Warsaw2009-01-03 05:13:41 -0500
commite5a96f14fb0fe8196e7b3ea0306c9f57f45c3110 (patch)
treee456327300678100b6cc6dfa625c7bc31a9f34a4 /mailman/database
parentc0522afd1754c7a18c40c9ebaa6c2ef406929170 (diff)
downloadmailman-e5a96f14fb0fe8196e7b3ea0306c9f57f45c3110.tar.gz
mailman-e5a96f14fb0fe8196e7b3ea0306c9f57f45c3110.tar.zst
mailman-e5a96f14fb0fe8196e7b3ea0306c9f57f45c3110.zip
- For command line scripts, -C names the configuration file to use. For
convenient testing, if -C is not given, then the environment variable MAILMAN_CONFIG_FILE is consulted. - Mailing lists no longer have a .web_page_url attribute; this is taken from the mailing list's domain's base_url attribute. - Incoming MTA selection is now taken from the config file instead of plugins. An MTA for Postfix+LMTP is added. bin/genaliases works again. - The LMTP server now properly calculates the message's original size. - If a message has no Message-ID, the stock archivers will return None for the permalink now instead of raising an assertion. - IArchiver no longer has an is_enabled property; this is taken from the configuration file now. - In bin/create_list, fixed a unicode problem when the language is defined in the configuration file. - Fixed bin/dumbdb, bin/list_lists, bin/remove_list, bin/unshunt, and bin/mailmanctl - config.archivers is a property now, not a dictionary that needs initialization from plugins. - IMailTransportAgent interface has been added.
Diffstat (limited to 'mailman/database')
-rw-r--r--mailman/database/mailinglist.py7
-rw-r--r--mailman/database/mailman.sql1
2 files changed, 5 insertions, 3 deletions
diff --git a/mailman/database/mailinglist.py b/mailman/database/mailinglist.py
index 641245daf..483cc4749 100644
--- a/mailman/database/mailinglist.py
+++ b/mailman/database/mailinglist.py
@@ -19,6 +19,7 @@ import os
import string
from storm.locals import *
+from urlparse import urljoin
from zope.interface import implements
from mailman import Defaults
@@ -45,7 +46,6 @@ class MailingList(Model):
host_name = Unicode()
# Attributes not directly modifiable via the web u/i
created_at = DateTime()
- web_page_url = Unicode()
admin_member_chunksize = Int()
hold_and_cmd_autoresponses = Pickle()
# Attributes which are directly modifiable via the web u/i. The more
@@ -202,9 +202,12 @@ class MailingList(Model):
def script_url(self, target, context=None):
"""See `IMailingList`."""
+ # Find the domain for this mailing list.
+ domain = config.domains[self.host_name]
# XXX Handle the case for when context is not None; those would be
# relative URLs.
- return self.web_page_url + target + '/' + self.fqdn_listname
+ return urljoin(domain.base_url,
+ target + Defaults.CGIEXT + '/' + self.fqdn_listname)
@property
def data_path(self):
diff --git a/mailman/database/mailman.sql b/mailman/database/mailman.sql
index 3cef32e24..b098ed13b 100644
--- a/mailman/database/mailman.sql
+++ b/mailman/database/mailman.sql
@@ -30,7 +30,6 @@ CREATE TABLE mailinglist (
list_name TEXT,
host_name TEXT,
created_at TIMESTAMP,
- web_page_url TEXT,
admin_member_chunksize INTEGER,
hold_and_cmd_autoresponses BLOB,
next_request_id INTEGER,