X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/bf8b3154e3a3d09be0d30516bf42a4652bcdedc8..9f342387ccdbf24bbf78a6f374738607de6de974:/fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 812d2e062..6a92b7e91 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -1,6 +1,7 @@
 from __future__ import with_statement # needed for python 2.5
 from fabric.api import *
 from fabric.contrib import files
+from fabric.context_managers import path
 
 import os
 
@@ -24,21 +25,13 @@ def staging():
 
 def production():
     """Use production server"""
-    env.hosts = ['wolnelektury.pl:22123']
-    env.user = 'fundacja'
-    env.path = '/opt/lektury/wolnelektury'
-    env.python = '/opt/lektury/basevirtualenv/bin/python'
-    env.virtualenv = '/opt/lektury/basevirtualenv/bin/virtualenv'
-    env.pip = '/opt/lektury/basevirtualenv/bin/pip'
-
-def giewont():
-    """Use giewont server"""
-    env.hosts = ['giewont.icm.edu.pl']
-    env.user = 'rczajka'
+    env.hosts = ['wolnelektury.pl']
+    env.user = 'lektury'
     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'
+    env.restart_webserver = restart_gunicorn_debian
 
 # =========
 # = Tasks =
@@ -74,11 +67,14 @@ def deploy():
     upload_tar_from_git()
     upload_wsgi_script()
     upload_vhost_sample()
+    upload_celery_conf()
     install_requirements()
     copy_localsettings()
     symlink_current_release()
     migrate()
+    collectstatic()
     restart_webserver()
+    restart_celery()
 
 def deploy_version(version):
     "Specify a specific version to be made live"
@@ -88,6 +84,7 @@ def deploy_version(version):
         run('rm releases/previous; mv releases/current releases/previous;', pty=True)
         run('ln -s %(version)s releases/current' % env, pty=True)
     restart_webserver()
+    restart_celery()
 
 def rollback():
     """
@@ -101,6 +98,7 @@ def rollback():
         run('mv releases/previous releases/current;', pty=True)
         run('mv releases/_previous releases/previous;', pty=True)
     restart_webserver()
+    restart_celery()
 
 
 # =====================================================================
@@ -129,11 +127,17 @@ def upload_wsgi_script():
     files.upload_template('%(project_name)s.wsgi.template' % env, '%(path)s/%(project_name)s.wsgi' % env, context=env)
     run('chmod ug+x %(path)s/%(project_name)s.wsgi' % env)
 
+def upload_celery_conf():
+    "Create and upload a Celery conf for supervisord"
+    print ">>> upload celery supervisord conf"
+    files.upload_template('%(project_name)s-celery.conf.template' % env, '%(path)s/%(project_name)s-celery.conf' % env, context=env)
+    run('chmod ug+x %(path)s/%(project_name)s-celery.conf' % env)
+
 def install_requirements():
     "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)"
@@ -158,11 +162,35 @@ def migrate():
     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:
-            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_gunicorn_debian():
+    """Restarts gunicorn server using debian script."""
+    print '>>> restart gunicorn'
+    require('project_name', provided_by=[staging, production])
+    with path('/sbin'):
+        sudo('gunicorn-debian restart %(project_name)s' % env, shell=False)
 
 def restart_webserver():
-    "Restart the web server"
-    print '>>> restart webserver'
-    run('touch %(path)s/%(project_name)s.wsgi' % env)
+    """Restarts the web server."""
+    if hasattr(env, 'restart_webserver'):
+        env.restart_webserver()
+    else:
+        require('project_name', provided_by=[staging, production])
+        print '>>> restart webserver'
+        run('touch %(path)s/%(project_name)s.wsgi' % env)
+
+def restart_celery():
+    """Restarts the Celery task queue manager."""
+    print '>>> restart Celery'
+    require('project_name', provided_by=[staging, production])
+    sudo('supervisorctl restart celery.%(project_name)s:' % env, shell=False)