Merge branch 'master' into sunburnt

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 764b9c3..30bce66 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -29,7 +29,7 @@ def production():
     env.path = '/srv/wolnelektury.pl'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.path = '/srv/wolnelektury.pl'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'

-    env.pip = '/usr/bin/pip'
+    env.pip = 've/bin/pip'

 
 # =========
 # = Tasks =
 
 # =========
 # = Tasks =


@@ -70,6 +70,7 @@ def deploy():
     copy_localsettings()
     symlink_current_release()
     migrate()
     copy_localsettings()
     symlink_current_release()
     migrate()

+    collectstatic()

     restart_webserver()
 
 def deploy_version(version):
     restart_webserver()
 
 def deploy_version(version):


@@ -131,7 +132,7 @@ def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'
     require('release', provided_by=[deploy])

-    run('cd %(path)s; %(pip)s install -E . -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)
+    run('cd %(path)s; %(pip)s install -E ve -r %(path)s/releases/%(release)s/requirements.txt' % env, pty=True)

 
 def copy_localsettings():
     "Copy localsettings.py from root directory to release directory (if this file exists)"
 
 def copy_localsettings():
     "Copy localsettings.py from root directory to release directory (if this file exists)"


@@ -156,13 +157,20 @@ def migrate():
     print '>>> migrate'
     require('project_name', provided_by=[staging, production])
     with cd('%(path)s/releases/current/%(project_name)s' % env):
     print '>>> migrate'
     require('project_name', provided_by=[staging, production])
     with cd('%(path)s/releases/current/%(project_name)s' % env):

-        run('../../../bin/python manage.py syncdb --noinput' % env, pty=True)
+        run('../../../ve/bin/python manage.py syncdb --noinput' % env, pty=True)

         if env.use_south:
         if env.use_south:

-            run('../../../bin/python manage.py migrate' % env, pty=True)
+            run('../../../ve/bin/python manage.py migrate' % env, pty=True)
+
+def collectstatic():
+    """Collect static files"""
+    print '>>> collectstatic'
+    require('project_name', provided_by=[staging, production])
+    with cd('%(path)s/releases/current/%(project_name)s' % env):
+        run('../../../ve/bin/python manage.py collectstatic --noinput' % env, pty=True)

 
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
     run('touch %(path)s/%(project_name)s.wsgi' % env)
     print '>>> restart Celery'
 
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
     run('touch %(path)s/%(project_name)s.wsgi' % env)
     print '>>> restart Celery'

-    sudo('supervisorctl restart celery.%(project_name)s' % env)
+    sudo('supervisorctl restart celery.%(project_name)s:' % env, shell=False)