diff --git a/modoboa/extensions/stats/app_settings.py b/modoboa/extensions/stats/app_settings.py index 8020e7299..86e0a749a 100644 --- a/modoboa/extensions/stats/app_settings.py +++ b/modoboa/extensions/stats/app_settings.py @@ -21,9 +21,3 @@ class ParametersForm(AdminParametersForm): initial="/tmp/modoboa", help_text=ugettext_lazy("Path to directory where RRD files are stored") ) - - img_rootdir = forms.CharField( - label=ugettext_lazy("Directory to store PNG files"), - initial="/tmp/modoboa", - help_text=ugettext_lazy("Path to directory where PNG files are stored") - ) diff --git a/modoboa/extensions/stats/grapher.py b/modoboa/extensions/stats/grapher.py index 289ae93d2..d410f74b1 100644 --- a/modoboa/extensions/stats/grapher.py +++ b/modoboa/extensions/stats/grapher.py @@ -3,6 +3,7 @@ import sys import os import time from django.utils.translation import ugettext as _, ugettext_lazy +from django.conf import settings from modoboa.lib import parameters periods = [{"name": "day", "label": ugettext_lazy("Day")}, @@ -35,7 +36,7 @@ def str2Time(y, M, d, h="00", m="00", s="00"): class Grapher(object): def __init__(self): self.rrd_rootdir = parameters.get_admin("RRD_ROOTDIR") - self.img_rootdir = parameters.get_admin("IMG_ROOTDIR") + self.img_rootdir = os.path.join(settings.MEDIA_ROOT, "stats") def process(self, target, suffix, start, end, graph_tpl): import rrdtool diff --git a/modoboa/lib/fixtures/demo.json b/modoboa/lib/fixtures/demo.json index cdd99ecb9..737dff0b0 100644 --- a/modoboa/lib/fixtures/demo.json +++ b/modoboa/lib/fixtures/demo.json @@ -39,14 +39,6 @@ "value": "vmail" } }, - { - "pk": 12, - "model": "lib.parameter", - "fields": { - "name": "stats.IMG_ROOTDIR", - "value": "/srv/www/modoboa/media/stats" - } - }, { "pk": 13, "model": "lib.parameter",