X-Git-Url: https://git.mdrn.pl/fnpdjango.git/blobdiff_plain/f821cfe126c58ae516a0ef387be901b63951df9f..f22b82075d9060e0c4062315cc0f1d4401a44a3d:/fnpdjango/deploy/__init__.py?ds=inline

diff --git a/fnpdjango/deploy/__init__.py b/fnpdjango/deploy/__init__.py
index cd3c579..3fce286 100644
--- a/fnpdjango/deploy/__init__.py
+++ b/fnpdjango/deploy/__init__.py
@@ -16,6 +16,7 @@ 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)
+    skip_collect_static (optional): if True, Django collectstatic command is not called
 """
 from os.path import abspath, dirname, exists, join
 from django.utils.crypto import get_random_string
@@ -50,8 +51,7 @@ def setup():
 
 
 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)
@@ -67,7 +67,9 @@ def deploy():
     env.release = time.strftime('%Y-%m-%dT%H%M')
 
     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()
@@ -111,8 +113,7 @@ def deploy_version(version):
 
 @task
 def restart():
-    require('services')
-    for service in env.services:
+    for service in env.services or ():
         execute(service)
 
 
@@ -171,9 +172,9 @@ def upload_samples():
     for service in env.services:
         service.upload_sample()
 
-def upload_sample(name):
+def upload_sample(name, where="samples/"):
     require('app_path', 'project_name')
-    upload_path = '%(app_path)s/samples/' % env + name + '.sample'
+    upload_path = '%s/%s%s.sample' % (env['app_path'], where, name)
     if files.exists(upload_path):
         return
     print '>>> upload %s template' % name
@@ -185,7 +186,7 @@ def upload_sample(name):
 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')
 
@@ -260,6 +261,9 @@ def pre_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)
@@ -270,4 +274,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'])
-    return path
\ No newline at end of file
+    return path