X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e04a3d9448c218e380a0c281f2e6330df3166ead..c8fbdd51cb21e69bccf86cfe4b53fa307e6edcb2:/fabfile.py?ds=sidebyside

diff --git a/fabfile.py b/fabfile.py
index 13051778d..3d1be713b 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -21,16 +21,15 @@ def staging():
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'
     env.pip = '/usr/bin/pip'
-    
+
 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'
-
+    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'
 
 # =========
 # = Tasks =
@@ -47,15 +46,15 @@ def setup():
     """
     require('hosts', 'path', provided_by=[staging, production])
 
-    run('mkdir -p %(path)s; cd %(path)s; %(virtualenv)s --no-site-packages .;' % env, pty=True)
+    run('mkdir -p %(path)s; cd %(path)s; %(virtualenv)s .;' % env, pty=True)
     run('cd %(path)s; mkdir releases; mkdir shared; mkdir packages;' % env, pty=True)
     run('cd %(path)s/releases; ln -s . current; ln -s . previous' % env, pty=True)
     deploy()
 
 def deploy():
     """
-    Deploy the latest version of the site to the servers, 
-    install any required third party modules, 
+    Deploy the latest version of the site to the servers,
+    install any required third party modules,
     install the virtual host and then restart the webserver
     """
     require('hosts', 'path', provided_by=[staging, production])
@@ -66,6 +65,7 @@ def deploy():
     upload_tar_from_git()
     upload_wsgi_script()
     upload_vhost_sample()
+    upload_celery_conf()
     install_requirements()
     copy_localsettings()
     symlink_current_release()
@@ -99,10 +99,11 @@ def rollback():
 # = Helpers. These are called by other functions rather than directly =
 # =====================================================================
 def upload_tar_from_git():
-    "Create an archive from the current Git master branch and upload it"
+    "Create an archive from the current Git branch and upload it"
     print '>>> upload tar from git'
     require('release', provided_by=[deploy])
-    local('git archive --format=tar master | gzip > %(release)s.tar.gz' % env)
+    local('git-archive-all.sh --format tar %(release)s.tar' % env)
+    local('gzip %(release)s.tar' % env)
     run('mkdir -p %(path)s/releases/%(release)s' % env, pty=True)
     run('mkdir -p %(path)s/packages' % env, pty=True)
     put('%(release)s.tar.gz' % env, '%(path)s/packages/' % env)
@@ -120,6 +121,12 @@ 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'
@@ -156,4 +163,6 @@ def migrate():
 def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
-    run('touch %(path)s/releases/current/%(project_name)s/%(project_name)s.wsgi' % env)
+    run('touch %(path)s/%(project_name)s.wsgi' % env)
+    print '>>> restart Celery'
+    sudo('supervisorctl restart celery.%(project_name)s:' % env, shell=False)