github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-11-14 09:14:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the --dbaction option from the deploy command.

Browse Source
This commit is contained in:
Antoine Nguyen
2015-02-03 09:00:10 +01:00
parent dd1035de73
commit 0b86a686aa
4 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/commands/deploy.py
+9 -19
View File
@@ -1,4 +1,7 @@
# coding: utf-8
"""A shortcut to deploy a fresh modoboa instance."""
import getpass
import os
import shutil
@@ -12,7 +15,6 @@ from django.template import Context, Template
import dj_database_url
from modoboa.lib.sysutils import exec_cmd
from modoboa.core.commands import Command
DBCONN_TPL = """
@@ -47,10 +49,6 @@ class DeployCommand(Command):
'--with-amavis', action='store_true', default=False,
help='Include amavis configuration'
)
self._parser.add_argument(
'--dbaction', type=str, default="install",
help='Action to take on the database (install|upgrade)'
)
self._parser.add_argument(
'--collectstatic', action='store_true', default=False,
help='Run django collectstatic command'
@@ -215,24 +213,16 @@ class DeployCommand(Command):
os.mkdir("%s/media" % parsed_args.name)
os.unlink("%s/settings.pyc" % path)
if parsed_args.dbaction == "install":
self._exec_django_command(
"migrate", parsed_args.name, '--noinput'
)
self._exec_django_command(
"load_initial_data", parsed_args.name
)
elif parsed_args.dbaction == "upgrade":
exec_cmd('sed -ri "s|^#(\s+\'south)|\\1|" %s/settings.py' % path)
self._exec_django_command(
"syncdb", parsed_args.name, "--migrate"
)
self._exec_django_command(
"migrate", parsed_args.name, '--noinput'
)
self._exec_django_command(
"load_initial_data", parsed_args.name
)
if parsed_args.collectstatic:
self._exec_django_command(
"collectstatic", parsed_args.name, '--noinput'
)
self._exec_django_command(
"set_default_site", parsed_args.name, allowed_host
)