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

Using bower to manage javascript dependencies.

Browse Source
This commit is contained in:
Antoine Nguyen
2014-10-19 09:05:32 +02:00
parent 8fe30c86ea
commit bd4bfcb7fd
1070 changed files with 281991 additions and 6968 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/core/commands/deploy.py
+13 -4
View File
@@ -144,11 +144,14 @@ class DeployCommand(Command):
if parsed_args.with_amavis:
if parsed_args.amavis_dburl:
amavis_info = dj_database_url.config(default=parsed_args.amavis_dburl[0])
# In case the user fails to supply a valid database url, fallback to manual mode
amavis_info = dj_database_url.config(
default=parsed_args.amavis_dburl[0])
# In case the user fails to supply a valid database
# url, fallback to manual mode
if not amavis_info:
amavis_info = self.ask_db_info('amavis')
#If we set this earlier, our fallback method will never be triggered
# If we set this earlier, our fallback method will
# never be triggered
amavis_info['conn_name'] = 'amavis'
else:
amavis_info = self.ask_db_info('amavis')
@@ -164,13 +167,19 @@ class DeployCommand(Command):
'Under which domain do you want to deploy modoboa? '
)
bower_components_dir = os.path.realpath(
os.path.join(os.path.dirname(__file__), "../../bower_components")
)
mod = __import__(parsed_args.name, globals(), locals(), ['settings'])
tpl = self._render_template(
"%s/settings.py.tpl" % self._templates_dir, {
'default_conn': default_conn, 'amavis_conn': amavis_conn,
'secret_key': mod.settings.SECRET_KEY,
'name': parsed_args.name, 'django14': django14,
'allowed_host': allowed_host
'allowed_host': allowed_host,
'bower_components_dir': bower_components_dir,
'devmode': False
}
)
with open("%s/settings.py" % path, "w") as fp: