summaryrefslogtreecommitdiffstats
path: root/hyperkitty/lib
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2012-11-06 12:59:12 +0100
committerAurélien Bompard <aurelien@bompard.org>2012-11-06 12:59:12 +0100
commit9e650e050e15fa9de00f4e7df486b66ca3721fa5 (patch)
tree56eec497a74ac4bc20f3d90dc766a2237fa6ae5c /hyperkitty/lib
parent6273efb0f90255dea2c8db3e94de466f8022335a (diff)
downloadhyperkitty-9e650e050e15fa9de00f4e7df486b66ca3721fa5.tar.gz
hyperkitty-9e650e050e15fa9de00f4e7df486b66ca3721fa5.tar.xz
hyperkitty-9e650e050e15fa9de00f4e7df486b66ca3721fa5.zip
Adapt archiver configuration to the new code in mailman
Diffstat (limited to 'hyperkitty/lib')
-rw-r--r--hyperkitty/lib/archiver.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/hyperkitty/lib/archiver.py b/hyperkitty/lib/archiver.py
index bf1c1ff..05e084e 100644
--- a/hyperkitty/lib/archiver.py
+++ b/hyperkitty/lib/archiver.py
@@ -10,6 +10,7 @@ from urlparse import urljoin
from zope.interface import implements
from mailman.interfaces.archiver import IArchiver
from mailman.config import config
+from mailman.config.config import external_configuration
from django.core.urlresolvers import reverse
from kittystore import get_store
from kittystore.utils import get_message_id_hash
@@ -32,8 +33,9 @@ class Archiver(object):
configuration file, and load it to get the store's URL.
"""
# Read our specific configuration file
- self.config = config.archiver_config("hyperkitty")
- settings_path = self.config.get("general", "django_settings")
+ archiver_config = external_configuration(
+ config.archiver.hyperkitty.configuration)
+ settings_path = archiver_config.get("general", "django_settings")
if settings_path.endswith("/settings.py"):
# we want the directory
settings_path = os.path.dirname(settings_path)