From 0f87099f5e491ed36187c6f5b0d6e004bd69c7e9 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 7 Jun 2016 10:39:04 +0200
Subject: [PATCH] Fix amavis activation.

see #48
---
 modoboa_installer/scripts/modoboa.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py
index 5da39fe..fec9217 100644
--- a/modoboa_installer/scripts/modoboa.py
+++ b/modoboa_installer/scripts/modoboa.py
@@ -73,6 +73,14 @@ class Modoboa(base.Installer):
                     return
             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(
             os.path.join(self.venv_path, "bin", "activate"))
         args = [
@@ -86,7 +94,7 @@ class Modoboa(base.Installer):
         ]
         if self.devmode:
             args = ["--devel"] + args
-        if self.config.getboolean("amavis", "enabled"):
+        if amavis_enabled:
             args += [
                 "'amavis:{}://{}:{}@{}/{}'".format(
                     self.config.get("database", "engine"),