search - new result layout. the css is not perfect though.

[wolnelektury.git] / fabfile.py

diff --git a/fabfile.py b/fabfile.py
index 812d2e0..3d1be71 100644 (file)
--- a/fabfile.py
+++ b/fabfile.py
@@ -24,17 +24,8 @@ def staging():
 
 def production():
     """Use production server"""
 
 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.path = '/srv/wolnelektury.pl'
     env.python = '/usr/bin/python'
     env.virtualenv = '/usr/bin/virtualenv'


@@ -74,6 +65,7 @@ def deploy():
     upload_tar_from_git()
     upload_wsgi_script()
     upload_vhost_sample()
     upload_tar_from_git()
     upload_wsgi_script()
     upload_vhost_sample()

+    upload_celery_conf()

     install_requirements()
     copy_localsettings()
     symlink_current_release()
     install_requirements()
     copy_localsettings()
     symlink_current_release()


@@ -129,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)
 
     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'
 def install_requirements():
     "Install the required packages from the requirements file using pip"
     print '>>> install requirements'


@@ -166,3 +164,5 @@ def restart_webserver():
     "Restart the web server"
     print '>>> restart webserver'
     run('touch %(path)s/%(project_name)s.wsgi' % env)
     "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, shell=False)