fnp
/
fnpdjango.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deploy: Add root manage.py helper script, use fabric.context_managers.settings instea...
[fnpdjango.git]
/
fnpdjango
/
deploy
/
__init__.py
diff --git
a/fnpdjango/deploy/__init__.py
b/fnpdjango/deploy/__init__.py
index
cd3c579
..
1fbe57c
100644
(file)
--- a/
fnpdjango/deploy/__init__.py
+++ b/
fnpdjango/deploy/__init__.py
@@
-16,10
+16,13
@@
Then set up some env properties:
localsettings_dst_path (optional): path indicating
where to copy the localsettings file, relative
to django_root_path (defaults to project_name/localsettings.py)
localsettings_dst_path (optional): path indicating
where to copy the localsettings file, relative
to django_root_path (defaults to project_name/localsettings.py)
+ skip_collect_static (optional): if True, Django collectstatic command is not called
"""
"""
+from subprocess import check_output
from os.path import abspath, dirname, exists, join
from django.utils.crypto import get_random_string
from fabric.api import *
from os.path import abspath, dirname, exists, join
from django.utils.crypto import get_random_string
from fabric.api import *
+from fabric.context_managers import settings
from fabric.contrib import files
from fabric.tasks import Task, execute
from fabric.contrib import files
from fabric.tasks import Task, execute
@@
-40,6
+43,10
@@
def setup():
for subdir in 'releases', 'packages', 'log', 'samples':
if not files.exists(subdir):
run('mkdir -p %s' % subdir, pty=True)
for subdir in 'releases', 'packages', 'log', 'samples':
if not files.exists(subdir):
run('mkdir -p %s' % subdir, pty=True)
+ # Install helper manage.py script into root dir.
+ if not files.exists('manage.py'):
+ with settings(full_django_root=get_django_root_path('current')):
+ upload_sample('manage.py', where='', ext='', mode=0755)
with cd('%(app_path)s/releases' % env):
if not files.exists('current'):
run('ln -sfT . current', pty=True)
with cd('%(app_path)s/releases' % env):
if not files.exists('current'):
run('ln -sfT . current', pty=True)
@@
-50,8
+57,7
@@
def setup():
def check_localsettings():
def check_localsettings():
- if not files.exists('%(app_path)s/localsettings.py' % env):
- abort('localsettings.py file missing.')
+ return files.exists('%(app_path)s/localsettings.py' % env)
@task(default=True)
@task(default=True)
@@
-64,10
+70,12
@@
def deploy():
require('hosts', 'app_path')
import time
require('hosts', 'app_path')
import time
- env.release =
time.strftime('%Y-%m-%dT%H%M'
)
+ env.release =
'%s_%s' % (time.strftime('%Y-%m-%dT%H%M'), check_output(['git', 'rev-parse', 'HEAD']).strip()
)
setup()
setup()
- check_localsettings()
+ if not check_localsettings():
+ abort('Setup is complete, but\n %(app_path)s/localsettings.py\n'
+ 'is needed for actual deployment.' % env)
upload_tar_from_git()
copy_localsettings()
install_requirements()
upload_tar_from_git()
copy_localsettings()
install_requirements()
@@
-111,8
+119,7
@@
def deploy_version(version):
@task
def restart():
@task
def restart():
- require('services')
- for service in env.services:
+ for service in env.services or ():
execute(service)
execute(service)
@@
-134,7
+141,8
@@
class DebianGunicorn(Service):
sudo('gunicorn-debian restart %s' % self.name, shell=False)
def upload_sample(self):
sudo('gunicorn-debian restart %s' % self.name, shell=False)
def upload_sample(self):
- upload_sample('gunicorn')
+ with settings(full_django_root=get_django_root_path('current')):
+ upload_sample('gunicorn')
class Apache(Service):
def run(self):
class Apache(Service):
def run(self):
@@
-171,21
+179,21
@@
def upload_samples():
for service in env.services:
service.upload_sample()
for service in env.services:
service.upload_sample()
-def upload_sample(name):
+def upload_sample(name
, where="samples/", ext='.sample', **kwargs
):
require('app_path', 'project_name')
require('app_path', 'project_name')
- upload_path = '%
(app_path)s/samples/' % env + name + '.sample'
+ upload_path = '%
s/%s%s%s' % (env['app_path'], where, name, ext)
if files.exists(upload_path):
return
print '>>> upload %s template' % name
template = '%(project_name)s/' % env + name + '.template'
if not exists(template):
template = join(dirname(abspath(__file__)), 'templates/' + name + '.template')
if files.exists(upload_path):
return
print '>>> upload %s template' % name
template = '%(project_name)s/' % env + name + '.template'
if not exists(template):
template = join(dirname(abspath(__file__)), 'templates/' + name + '.template')
- files.upload_template(template, upload_path, env)
+ files.upload_template(template, upload_path, env
, **kwargs
)
def upload_localsettings_sample():
"Fill out localsettings template and upload as a sample."
env.secret_key = get_random_string(50)
def upload_localsettings_sample():
"Fill out localsettings template and upload as a sample."
env.secret_key = get_random_string(50)
- upload_sample('localsettings.py')
+ upload_sample('localsettings.py'
, where=""
)
upload_nginx_sample = lambda: upload_sample('nginx')
upload_nginx_sample = lambda: upload_sample('nginx')
@@
-260,6
+268,9
@@
def pre_collectstatic():
def collectstatic():
"""Collect static files"""
print '>>> collectstatic'
def collectstatic():
"""Collect static files"""
print '>>> collectstatic'
+ if env.get('skip_collect_static', False):
+ print '... skipped'
+ return
require('app_path', 'project_name')
with cd(get_django_root_path('current')):
run('%(app_path)s/ve/bin/python manage.py collectstatic --noinput' % env, pty=True)
require('app_path', 'project_name')
with cd(get_django_root_path('current')):
run('%(app_path)s/ve/bin/python manage.py collectstatic --noinput' % env, pty=True)
@@
-270,4
+281,4
@@
def get_django_root_path(release):
path = '%(app_path)s/releases/%(release)s' % dict(app_path = env['app_path'], release = release)
if 'django_root_path' in env:
path = join(path, env['django_root_path'])
path = '%(app_path)s/releases/%(release)s' % dict(app_path = env['app_path'], release = release)
if 'django_root_path' in env:
path = join(path, env['django_root_path'])
- return path
\ No newline at end of file
+ return path