Imported it infopages to fixture

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 855d6bd..84605a2 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -24,13 +24,12 @@ 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'
-
+    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,7 +46,7 @@ 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()
@@ -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()
@@ -121,11 +121,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)"
@@ -150,11 +156,13 @@ 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 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)