Fix amavis activation.

see #48
This commit is contained in:
Antoine Nguyen
2016-06-07 10:39:04 +02:00
parent b20400fd98
commit 0f87099f5e

View File

@@ -73,6 +73,14 @@ class Modoboa(base.Installer):
return return
shutil.rmtree(target) shutil.rmtree(target)
# Sanity check for amavis
amavis_enabled = False
if "modoboa-amavis" in self.extensions:
if self.config.getboolean("amavis", "enabled"):
amavis_enabled = True
else:
self.extensions.remove("modoboa-amavis")
prefix = ". {}; ".format( prefix = ". {}; ".format(
os.path.join(self.venv_path, "bin", "activate")) os.path.join(self.venv_path, "bin", "activate"))
args = [ args = [
@@ -86,7 +94,7 @@ class Modoboa(base.Installer):
] ]
if self.devmode: if self.devmode:
args = ["--devel"] + args args = ["--devel"] + args
if self.config.getboolean("amavis", "enabled"): if amavis_enabled:
args += [ args += [
"'amavis:{}://{}:{}@{}/{}'".format( "'amavis:{}://{}:{}@{}/{}'".format(
self.config.get("database", "engine"), self.config.get("database", "engine"),