On 27 May 2013, at 5:21 PM, Mark Sapiro <m...@msapiro.net> wrote: > Fix accepted and committed to the branch at > <https://code.launchpad.net/~msapiro/mailman/vhost>. > > Thank you.
Here is another small issue, when VIRTUAL_HOST_OVERVIEW was switched off to
allow all virtual lists to appear on the same host, the host_name of the list
wasn't passed in the URL. The attached patch fixes this.
diff -u -r mailman-2.1.12/Mailman/MailList.py
mailman-2.1.12-patched/Mailman/MailList.py
--- mailman-2.1.12/Mailman/MailList.py 2013-05-28 10:39:09.333154778 +0000
+++ mailman-2.1.12-patched/Mailman/MailList.py 2013-05-28 10:40:57.874209489
+0000
@@ -252,6 +252,9 @@
def GetScriptURL(self, scriptname, absolute=0):
# Using "local_part" here works for both site wide lists on
# the default url host and for vhost lists on the vhost url host.
+ if not mm_cfg.VIRTUAL_HOST_OVERVIEW:
+ return Utils.ScriptURL(scriptname, self.web_page_url, absolute) + \
+ '/' + self.local_part + '@' + self.host_name
return Utils.ScriptURL(scriptname, self.web_page_url, absolute) + \
'/' + self.local_part
Only in mailman-2.1.12-patched: autom4te.cache
diff -u -r mailman-2.1.12/bin/newlist mailman-2.1.12-patched/bin/newlist
--- mailman-2.1.12/bin/newlist 2013-05-28 10:39:09.339158852 +0000
+++ mailman-2.1.12-patched/bin/newlist 2013-05-28 10:21:04.730131451 +0000
@@ -165,7 +165,7 @@
emailhost = domain
elif emailhost != domain:
usage(1, C_('You cannot use an email host different from the
domain part of the list name.'))
- if not mm_cfg.VIRTUAL_HOSTS.has_key(urlhost):
+ if mm_cfg.VIRTUAL_HOST_OVERVIEW and not
mm_cfg.VIRTUAL_HOSTS.has_key(urlhost):
_urlhost = repr(urlhost)
_emailhost = repr(emailhost)
usage(1, C_('The Mailman config file lacks a line mapping urlhost
to emailhost:\n add_virtualhost(%(_urlhost)s,\n
%(_emailhost)s)'))
Regards,
Graham
--
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Mailman-Developers mailing list Mailman-Developers@python.org http://mail.python.org/mailman/listinfo/mailman-developers Mailman FAQ: http://wiki.list.org/x/AgA3 Searchable Archives: http://www.mail-archive.com/mailman-developers%40python.org/ Unsubscribe: http://mail.python.org/mailman/options/mailman-developers/archive%40jab.org Security Policy: http://wiki.list.org/x/QIA9
