fnp
/
fnpdjango.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pre_collectstatic hook
[fnpdjango.git]
/
fnpdjango
/
deploy
/
__init__.py
diff --git
a/fnpdjango/deploy/__init__.py
b/fnpdjango/deploy/__init__.py
index
f0f4837
..
f47790d
100644
(file)
--- a/
fnpdjango/deploy/__init__.py
+++ b/
fnpdjango/deploy/__init__.py
@@
-13,6
+13,9
@@
Then set up some env properties:
django_root_path (optional): path to the directory
containing django project, relative to the
root of the repository (defaults to '.')
django_root_path (optional): path to the directory
containing django project, relative to the
root of the repository (defaults to '.')
+ localsettings_dst_path (optional): path indicating
+ where to copy the localsettings file, relative
+ to django_root_path (defaults to project_name/localsettings.py)
"""
from os.path import abspath, dirname, exists, join
from django.utils.crypto import get_random_string
"""
from os.path import abspath, dirname, exists, join
from django.utils.crypto import get_random_string
@@
-70,6
+73,7
@@
def deploy():
install_requirements()
symlink_current_release()
migrate()
install_requirements()
symlink_current_release()
migrate()
+ pre_collectstatic()
collectstatic()
restart()
collectstatic()
restart()
@@
-214,7
+218,7
@@
def copy_localsettings():
require('app_path', 'project_name')
with settings(warn_only=True):
require('app_path', 'project_name')
with settings(warn_only=True):
- copy_to = join(get_django_root_path(env['release']), env
['project_name']
)
+ copy_to = join(get_django_root_path(env['release']), env
.get('localsettings_dst_path', env['project_name'])
)
run('cp %(app_path)s/localsettings.py ' % env + copy_to)
def symlink_current_release():
run('cp %(app_path)s/localsettings.py ' % env + copy_to)
def symlink_current_release():
@@
-234,6
+238,11
@@
def migrate():
run('%(app_path)s/ve/bin/python manage.py syncdb --noinput' % env, pty=True)
run('%(app_path)s/ve/bin/python manage.py migrate' % env, pty=True)
run('%(app_path)s/ve/bin/python manage.py syncdb --noinput' % env, pty=True)
run('%(app_path)s/ve/bin/python manage.py migrate' % env, pty=True)
+def pre_collectstatic():
+ print '>>> pre_collectstatic'
+ for task in env.get('pre_collectstatic', []):
+ execute(task)
+
def collectstatic():
"""Collect static files"""
print '>>> collectstatic'
def collectstatic():
"""Collect static files"""
print '>>> collectstatic'