diff --git a/installer.cfg b/installer.cfg index 5226a35..326bac6 100644 --- a/installer.cfg +++ b/installer.cfg @@ -4,8 +4,8 @@ tls_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem [database] # Select database engine : postgres or mysql -engine = postgres -#engine = mysql +#engine = postgres +engine = mysql host = 127.0.0.1 install = true @@ -28,6 +28,8 @@ dbuser = modoboa dbpassword = password # Extensions to install (to install all of them, use: all) extensions = modoboa-amavis modoboa-pdfcredentials modoboa-postfix-autoreply modoboa-sievefilters modoboa-stats modoboa-webmail +# Deploy Modoboa and enable development mode +devmode = false [amavis] enabled = true diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 89c5b12..d2c8175 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -34,6 +34,7 @@ class Modoboa(base.Installer): self.venv_path = config.get("modoboa", "venv_path") self.instance_path = config.get("modoboa", "instance_path") self.extensions = config.get("modoboa", "extensions").split() + self.devmode = config.getboolean("modoboa", "devmode") def _setup_venv(self): """Prepare a dedicated virtuelenv.""" @@ -44,6 +45,11 @@ class Modoboa(base.Installer): else: packages.append("MYSQL-Python") python.install_packages(packages, self.venv_path, sudo_user=self.user) + if self.devmode: + # FIXME: use dev-requirements instead + python.install_packages( + ["django-bower", "django-debug-toolbar"], self.venv_path, + sudo_user=self.user) def _deploy_instance(self): """Deploy Modoboa.""" @@ -71,6 +77,8 @@ class Modoboa(base.Installer): self.config.get("database", "engine"), self.dbname, self.dbpasswd, self.dbhost) ] + if self.devmode: + args = ["--devel"] + args if self.config.getboolean("amavis", "enabled"): args += [ "amavis:{}://{}:{}@{}/{}".format(