summaryrefslogtreecommitdiffstats
path: root/hyperkitty/archiver.py
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2013-06-06 11:08:42 +0200
committerAurélien Bompard <aurelien@bompard.org>2013-06-06 11:08:42 +0200
commit44a3da0ede4a028da4896c6e5f1ff136ac380f76 (patch)
tree501f6aba380c2f2ea05603890d45beacc2778fbe /hyperkitty/archiver.py
parente41cd396f324186115ae315d282b7f14a7ded7e3 (diff)
downloadhyperkitty-44a3da0ede4a028da4896c6e5f1ff136ac380f76.tar.gz
hyperkitty-44a3da0ede4a028da4896c6e5f1ff136ac380f76.tar.xz
hyperkitty-44a3da0ede4a028da4896c6e5f1ff136ac380f76.zip
Fix a old bug in the Archiver interface
This was really stupid. I don't code when I'm drunk though.
Diffstat (limited to 'hyperkitty/archiver.py')
-rw-r--r--hyperkitty/archiver.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/hyperkitty/archiver.py b/hyperkitty/archiver.py
index 7e79b08..fa294de 100644
--- a/hyperkitty/archiver.py
+++ b/hyperkitty/archiver.py
@@ -44,6 +44,7 @@ class Archiver(object):
def __init__(self):
self.store = None
+ self.base_url = None
self.store_url = None
self._load_conf()
@@ -55,6 +56,7 @@ class Archiver(object):
# Read our specific configuration file
archiver_config = external_configuration(
config.archiver.hyperkitty.configuration)
+ self.base_url = archiver_config.get("general", "base_url")
settings_path = archiver_config.get("general", "django_settings")
if settings_path.endswith("/settings.py"):
# we want the directory
@@ -79,7 +81,7 @@ class Archiver(object):
:param mlist: The IMailingList object.
:returns: The url string.
"""
- return urljoin(self.store_url,
+ return urljoin(self.base_url,
reverse('list_overview', args=[mlist.fqdn_listname]))
def permalink(self, mlist, msg):
@@ -95,7 +97,7 @@ class Archiver(object):
"""
msg_id = msg['Message-Id'].strip().strip("<>")
msg_hash = get_message_id_hash(msg_id)
- return urljoin(self.store_url, reverse('message_index',
+ return urljoin(self.base_url, reverse('message_index',
kwargs={"mlist_fqdn": mlist.fqdn_listname,
"message_id_hash": msg_hash}))